Browse Source

订单状态

master
常熟吴彦祖 2 months ago
parent
commit
bb8629aae9
  1. 2
      src/api/port/portTransit.js
  2. 226
      src/views/modules/order/com_poOrderSearchBar.vue
  3. 40
      src/views/modules/order/com_poOrder_CustomerPicker.vue
  4. 82
      src/views/modules/order/poOrder.vue
  5. 102
      src/views/modules/order/poOrderAdvancedQueryHelper.js
  6. 89
      src/views/modules/order/poOrderSearchOptionsMixin.js
  7. 127
      src/views/modules/order/poOrder_search.vue
  8. 127
      src/views/modules/order/poOrder_search_en.vue

2
src/api/port/portTransit.js

@ -8,3 +8,5 @@ export const getTransitList = data => createAPI('/portTransitCycle/list', 'POST'
export const updateTransit = data => createAPI('/portTransitCycle/save', 'POST', data)
// 查询运输选项列表
export const searchTransportOptions = data => createAPI('/portTransitCycle/calculateArrivalTime', 'POST', data)
// 启用的运输方式,PO 筛选下拉使用
export const listActiveShipMethods = data => createAPI('/portTransitCycle/shipMethodList', 'POST', data || {})

226
src/views/modules/order/com_poOrderSearchBar.vue

@ -0,0 +1,226 @@
<template>
<!-- 三个 PO 页面共用顶部筛选。leading 插槽放 Customer,与条件同一行。框宽统一 100px。 -->
<el-form class="po-order-search-form" :inline="true" label-position="top" :model="searchData" @submit.native.prevent>
<slot name="leading"></slot>
<el-form-item label="Planner">
<el-input v-model="searchData.plannerAccount" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="Buyer">
<el-input v-model="searchData.buyer" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="Supplier">
<el-input v-model="searchData.supplierName" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="PO">
<el-input v-model="searchData.poNo" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="ITEM">
<el-input v-model="searchData.item" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="LOGISTICS ID">
<el-input v-model="searchData.flexid" clearable style="width: 130px" @keyup.enter.native="emitSearch"></el-input>
</el-form-item>
<el-form-item label="Ship Method">
<el-select
v-model="searchData.shipViaList"
multiple
collapse-tags
clearable
filterable
placeholder="Please select"
style="width: 130px">
<el-option
v-for="item in shipMethodOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="Status">
<el-select
v-model="searchData.statusDisplayList"
multiple
collapse-tags
clearable
filterable
placeholder="Please select"
style="width: 130px"
@visible-change="onStatusVisible">
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="Destination">
<el-select
v-model="searchData.destinationList"
multiple
collapse-tags
clearable
filterable
placeholder="Please select"
style="width: 130px">
<el-option
v-for="item in destinationOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="Telex Release">
<el-select v-model="searchData.telexRelease" clearable placeholder="Please select" style="width: 130px">
<el-option label="Yes" value="Yes"></el-option>
<el-option label="No" value="No"></el-option>
</el-select>
</el-form-item>
<!-- 日期仍是起止两个单日框。每个框 100px,短横线垂直居中。只填一端时另一端不参与过滤。 -->
<el-form-item label="PO Enquiry Date">
<span class="po-date-pair">
<el-date-picker v-model="searchData.enquiryDateStart" type="date" placeholder="Start Date"
value-format="yyyy-MM-dd"
style="width:130px" />
<span class="po-date-sep">-</span>
<el-date-picker v-model="searchData.enquiryDateEnd" type="date" placeholder="End Date"
value-format="yyyy-MM-dd"
style="width:130px" />
</span>
</el-form-item>
<el-form-item label="PO Issue Date">
<span class="po-date-pair">
<el-date-picker v-model="searchData.issueDateStart" type="date" placeholder="Start Date"
value-format="yyyy-MM-dd"
style="width:130px" />
<span class="po-date-sep">-</span>
<el-date-picker v-model="searchData.issueDateEnd" type="date" placeholder="End Date"
value-format="yyyy-MM-dd"
style="width:130px" />
</span>
</el-form-item>
<el-form-item label="ETA">
<span class="po-date-pair">
<el-date-picker v-model="searchData.etaDateStart" type="date" placeholder="Start Date"
value-format="yyyy-MM-dd"
style="width:130px" />
<span class="po-date-sep">-</span>
<el-date-picker v-model="searchData.etaDateEnd" type="date" placeholder="End Date"
value-format="yyyy-MM-dd"
style="width:130px" />
</span>
</el-form-item>
<el-form-item label="OBD">
<span class="po-date-pair">
<el-date-picker v-model="searchData.obdDateStart" type="date" placeholder="Start Date"
value-format="yyyy-MM-dd"
style="width:130px" />
<span class="po-date-sep">-</span>
<el-date-picker v-model="searchData.obdDateEnd" type="date" placeholder="End Date"
value-format="yyyy-MM-dd"
style="width:130px" />
</span>
</el-form-item>
<el-form-item label="CRD">
<span class="po-date-pair">
<el-date-picker v-model="searchData.crdDateStart" type="date" placeholder="Start Date"
value-format="yyyy-MM-dd"
style="width:130px" />
<span class="po-date-sep">-</span>
<el-date-picker v-model="searchData.crdDateEnd" type="date" placeholder="End Date"
value-format="yyyy-MM-dd"
style="width:130px" />
</span>
</el-form-item>
</el-form>
</template>
<script>
/**
* PO 顶部筛选条。
* searchData 由父页面持有,本组件直接改同一对象。
* 回车只负责通知父页面查询,不在这里发请求。
*/
export default {
name: 'ComPoOrderSearchBar',
props: {
searchData: {
type: Object,
required: true
},
shipMethodOptions: {
type: Array,
default () {
return []
}
},
destinationOptions: {
type: Array,
default () {
return []
}
},
statusOptions: {
type: Array,
default () {
return []
}
}
},
methods: {
/** 输入框回车:交给父页面执行查询。父页面负责校验 Customer。 */
emitSearch () {
this.$emit('search')
},
/**
* 状态下拉展开时通知父页面刷新映射。
* 选项本身来自父页面已加载的显示状态。
*/
onStatusVisible (visible) {
this.$emit('status-visible', visible)
}
}
}
</script>
<style scoped>
/*
标签固定两行高度,短标题和长标题的输入框落在同一水平线。
控件间距只用 --po-field-gap。日期中间的横线放在同一段间距里,居中,不再额外加宽。
*/
.po-order-search-form {
--po-field-width: 130px;
--po-field-gap: 12px;
}
.po-order-search-form /deep/ .el-form-item {
vertical-align: top;
margin-right: var(--po-field-gap);
margin-bottom: var(--po-field-gap);
}
.po-order-search-form /deep/ .el-form-item__label {
height: 32px;
line-height: 16px;
padding: 0 0 4px;
white-space: normal;
}
.po-order-search-form /deep/ .el-form-item__content {
line-height: 32px;
}
.po-order-search-form /deep/ .el-input,
.po-order-search-form /deep/ .el-select,
.po-order-search-form /deep/ .el-date-editor.el-input {
width: var(--po-field-width);
}
.po-date-pair {
display: inline-flex;
align-items: center;
}
.po-date-pair /deep/ .el-date-editor {
margin: 0;
}
.po-date-sep {
flex: 0 0 var(--po-field-gap);
width: var(--po-field-gap);
text-align: center;
line-height: 1;
}
</style>

40
src/views/modules/order/com_poOrder_CustomerPicker.vue

@ -1,6 +1,26 @@
<template>
<div class="po-customer-picker">
<el-form :inline="true" label-position="top">
<!--
embedded 时用 display:contents 脱掉外层,让 Customer 成为筛选表单的第一项。
未嵌入时保持独立表单,供导入等页面单独使用。
-->
<div class="po-customer-picker" :class="{ 'is-embedded': embedded }">
<el-form-item v-if="embedded" label="Customer">
<el-select
v-model="innerCustomer"
:disabled="disabled || options.length === 0"
filterable
placeholder="Please select"
style="width: 130px"
@change="handleChange">
<el-option
v-for="item in options"
:key="item.code"
:label="formatLabel(item)"
:value="item.code" />
</el-select>
<div v-if="options.length === 0" class="po-customer-empty">当前账号无 Customer 权限</div>
</el-form-item>
<el-form v-else :inline="true" label-position="top">
<el-form-item label="Customer">
<el-select
v-model="innerCustomer"
@ -31,7 +51,9 @@ export default {
props: {
site: { type: String, required: true },
value: { type: String, default: '' },
disabled: { type: Boolean, default: false }
disabled: { type: Boolean, default: false },
/** 为 true 时只输出表单项,供筛选条插到第一列。 */
embedded: { type: Boolean, default: false }
},
data () {
return {
@ -99,3 +121,15 @@ export default {
}
}
</script>
<style scoped>
/* 嵌入筛选行时不产生自己的盒子,避免 Customer 独占一行。 */
.po-customer-picker.is-embedded {
display: contents;
}
.po-customer-empty {
color: #f56c6c;
font-size: 12px;
line-height: 16px;
}
</style>

82
src/views/modules/order/poOrder.vue

@ -1,45 +1,19 @@
<template>
<div ref="pageRoot" class="mod-config">
<com-po-order-customer-picker
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="PO No">
<el-input v-model="searchData.poNo" clearable style="width: 140px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="searchData.orderType" placeholder="请选择" style="width: 120px" clearable>
<el-option
v-for="item in poOrderTypeSearchOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(2017)"><a href="javascript:void(0)">Part No</a></span>
<el-input v-model="searchData.partNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(520)"><a href="javascript:void(0)">供应商编码</a></span>
<el-input v-model="searchData.supplierNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="searchData.sku" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="Status">
<el-select v-model="searchData.status" placeholder="请选择" style="width:180px" clearable filterable @visible-change="onPoStatusDropdownVisible">
<el-option label="全部" value=""></el-option>
<el-option
v-for="item in poOrderStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-form>
<com-po-order-search-bar
:search-data="searchData"
:ship-method-options="shipMethodOptions"
:destination-options="destinationOptions"
:status-options="poOrderStatusOptions"
@search="handleSearch"
@status-visible="onPoStatusDropdownVisible">
<com-po-order-customer-picker
slot="leading"
embedded
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
</com-po-order-search-bar>
<el-form :inline="true" label-position="top" style="margin-top:10px ">
<el-form-item>
<el-button type="primary" @click="handleSearch()" v-if="!editMode" :disabled="!searchData.customer">查询</el-button>
@ -66,7 +40,7 @@
label="操作"
header-align="center"
align="center"
width="170">
width="100">
<template slot-scope="scope">
<div class="po-row-action-wrap">
<el-link
@ -705,6 +679,7 @@ import {
import {
createAdvancedQueryData,
createAdvancedQueryDataFromSchema,
createPoOrderSearchData,
buildPoOrderQueryParams
} from './poOrderAdvancedQueryHelper.js'
import {
@ -724,8 +699,9 @@ import {
resolvePoOrderStatusByInspectQty,
buildPoDetailActionParams
} from './poOrderStatusOptions.js'
import { PO_ORDER_TYPE_OPTIONS, PO_ORDER_TYPE_FILTER_OPTIONS, formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import { PO_ORDER_TYPE_FILTER_OPTIONS, formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import poOrderStatusMappingMixin from './poOrderStatusMappingMixin.js'
import poOrderSearchOptionsMixin from './poOrderSearchOptionsMixin.js'
import { getPartList, searchPartInfo } from '@/api/part/partInfo.js'
import excel from '@/utils/excel-util.js'
import { checkSrmSupplierList } from '@/api/srm/srmSupplier.js'
@ -737,6 +713,7 @@ import {
resolveSupplierShortFieldsFromDetail
} from '@/utils/supplierChooselistHelper.js'
import { searchTransportOptions } from '@/api/port/portTransit.js'
import ComPoOrderSearchBar from './com_poOrderSearchBar.vue'
import ChooselistEam from '@/views/modules/common/Chooselist_eam.vue'
import PoOrderAdvancedQuery from './com_poOrderAdvancedQuery.vue'
import ComPoOrderCustomerPicker from './com_poOrder_CustomerPicker.vue'
@ -768,7 +745,7 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
* - loading: 页面级加载态(用于复杂异步流程时的全屏或局部控制)
* - masterRows: 主表展示数据(来自 searchPoDetailPage / searchPoDetailAdvancedPage)
* - currentRow: 当前选中主表行(行内编辑、联动选择时使用)
* - searchData: 查询条件对象(site/customer/buyer/poNo/orderType/partNo/supplierNo/sku/status/supplierName)
* - searchData: 顶部筛选(Planner账号、Buyer、Supplier名称、PO、ITEM、LOGISTICS ID、Ship Method、Status、Destination、Telex Release、五个日期区间)
* - advancedQueryData: 高级查询条件对象(由 schema 动态生成并参与最终查询)
* - pageIndex/pageSize/totalPage: 分页三要素
* - height: 主表动态高度(窗口变化时实时重算)
@ -864,12 +841,13 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
* - formatCodeOptionLabel, buildDeparturePortConSql, buildDestinationPortConSql
*/
export default {
mixins: [poOrderStatusMappingMixin], // rqrq - 列表、下拉和导出共用状态映射
mixins: [poOrderStatusMappingMixin, poOrderSearchOptionsMixin], // rqrq - 状态映射与顶部筛选下拉共用
name: 'PoOrder',
components: {
ChooselistEam,
PoOrderAdvancedQuery,
ComPoOrderCustomerPicker,
ComPoOrderSearchBar,
ComPoOrderDynamicFieldRenderer
},
data () {
@ -992,20 +970,8 @@ export default {
]
},
dictSelectOptionsMap: {},
// ===== 查询条件(公共入参)=====
searchData: {
site: this.$store.state.user.site,
customer: '',
buyer: '',
poNo: '',
orderType: '',
partNo: '',
supplierNo: '',
sku: '',
status: '',
supplierName: ''
},
poOrderTypeSearchOptions: [{ label: '全部', value: '' }, ...PO_ORDER_TYPE_OPTIONS],
// 顶部筛选。Customer 仍由上方选择器写入,不选不能查询。
searchData: createPoOrderSearchData(this.$store.state.user.site),
advancedQueryVisible: false,
/** 字段 schema(list 场景) */
fieldSchemaFields: [],

102
src/views/modules/order/poOrderAdvancedQueryHelper.js

@ -99,26 +99,98 @@ export function hasActiveAdvancedConditions (advancedQueryData) {
}
/**
* 组装查询/导出参数
* - 有高级条件时走 advancedPage,并附带 searchData 基础字段
* - 无高级条件时走原 page
* 三个 PO 页面共用的顶部筛选初始值。
* 文本为空字符串,多选为空数组。
* 日期用起止两个独立字段,清空后为空字符串,只填一端时另一端不参与过滤。
* customer 由页面会话保留。
*/
export function createPoOrderSearchData (site, customer = '') {
return {
site: site || '',
customer: customer || '',
plannerAccount: '',
buyer: '',
supplierName: '',
poNo: '',
item: '',
flexid: '',
shipViaList: [],
statusDisplayList: [],
destinationList: [],
telexRelease: '',
enquiryDateStart: '',
enquiryDateEnd: '',
issueDateStart: '',
issueDateEnd: '',
etaDateStart: '',
etaDateEnd: '',
obdDateStart: '',
obdDateEnd: '',
crdDateStart: '',
crdDateEnd: ''
}
}
function trimSearchText (value) {
return value == null ? '' : String(value).trim()
}
/** 多选去空白。空数组表示该条件不参与查询。 */
function normalizeSearchList (list) {
if (!Array.isArray(list)) {
return []
}
return list.map(item => trimSearchText(item)).filter(Boolean)
}
/**
* Telex Release 页面值转库值。
* Yes 对应 true,No 对应 false;未选择时返回空,查询全部(含空值)。
*/
function mapTelexReleaseToDb (value) {
const text = trimSearchText(value)
if (text === 'Yes') {
return 'true'
}
if (text === 'No') {
return 'false'
}
return ''
}
/**
* 组装查询/导出参数。
* 有高级条件时走 advancedPage,顶部筛选一并带上。
* 顶部条件使用独立字段,不把页面值送进旧的 buyer/poNo/status 条件。
*/
export function buildPoOrderQueryParams ({ searchData, advancedQueryData, page, limit }) {
const source = searchData || {}
const conditions = getActiveAdvancedConditions(advancedQueryData)
const baseParams = {
site: searchData.site,
site: source.site,
page,
limit,
customer: searchData.customer || '',
buyer: searchData.buyer || '',
poNo: searchData.poNo || '',
sku: searchData.sku || '',
// rqrq - 英文筛选独立传参,禁止把显示值送入原始业务 status。
statusDisplayFilter: searchData.status || '',
orderType: searchData.orderType || '',
supplierNo: searchData.supplierNo || '',
supplierName: searchData.supplierName || '',
partNo: searchData.partNo || ''
customer: trimSearchText(source.customer),
plannerAccount: trimSearchText(source.plannerAccount),
buyerKeyword: trimSearchText(source.buyer),
supplierNameKeyword: trimSearchText(source.supplierName),
poNoKeyword: trimSearchText(source.poNo),
itemKeyword: trimSearchText(source.item),
flexidKeyword: trimSearchText(source.flexid),
shipViaList: normalizeSearchList(source.shipViaList),
statusDisplayList: normalizeSearchList(source.statusDisplayList),
destinationList: normalizeSearchList(source.destinationList),
telexReleaseValue: mapTelexReleaseToDb(source.telexRelease),
enquiryDateStart: trimSearchText(source.enquiryDateStart),
enquiryDateEnd: trimSearchText(source.enquiryDateEnd),
issueDateStart: trimSearchText(source.issueDateStart),
issueDateEnd: trimSearchText(source.issueDateEnd),
etaDateStart: trimSearchText(source.etaDateStart),
etaDateEnd: trimSearchText(source.etaDateEnd),
obdDateStart: trimSearchText(source.obdDateStart),
obdDateEnd: trimSearchText(source.obdDateEnd),
crdDateStart: trimSearchText(source.crdDateStart),
crdDateEnd: trimSearchText(source.crdDateEnd)
}
if (conditions.length > 0) {
return {
@ -127,7 +199,7 @@ export function buildPoOrderQueryParams ({ searchData, advancedQueryData, page,
}
}
return {
params: { ...searchData, status: '', statusDisplayFilter: searchData.status || '', page, limit },
params: baseParams,
useAdvanced: false
}
}

89
src/views/modules/order/poOrderSearchOptionsMixin.js

@ -0,0 +1,89 @@
import { searchPortList } from '@/api/port/portInfo.js'
import { listActiveShipMethods } from '@/api/port/portTransit.js'
/**
* PO 顶部筛选的运输方式、目的港选项。
* 运输方式取 ship_method.method_desc,与新增时写入的 ship_via 一致。
* 目的港取 is_destination_port = Y 的港口,查询值用港口编码。
*/
export default {
data () {
return {
shipMethodOptions: [],
destinationOptions: [],
shipMethodOptionsLoading: false,
destinationOptionsLoading: false
}
},
created () {
this.loadShipMethodOptions()
this.loadDestinationOptions()
},
methods: {
/**
* 加载运输方式下拉。
* 走启用运输方式接口,只查 active = Y,不再执行快捷查询里 where 1=1 的动态 SQL。
* 选项值和显示都用 methodDesc,与订单头 ship_via 一致。失败时清空选项并提示。
*/
loadShipMethodOptions () {
if (this.shipMethodOptionsLoading) {
return
}
this.shipMethodOptionsLoading = true
listActiveShipMethods({}).then(({ data }) => {
if (!data || data.code !== 0) {
throw new Error((data && data.msg) || '加载运输方式失败')
}
const rows = Array.isArray(data.rows) ? data.rows : []
const seen = new Set()
this.shipMethodOptions = rows.reduce((options, row) => {
const label = String((row && row.methodDesc) || '').trim()
if (!label || seen.has(label)) {
return options
}
seen.add(label)
options.push({ label, value: label })
return options
}, [])
}).catch(error => {
this.shipMethodOptions = []
this.$message.error(error.message || '加载运输方式失败')
}).finally(() => {
this.shipMethodOptionsLoading = false
})
},
/**
* 加载目的港下拉。
* 只取目的港主数据,选项值是港口编码,显示为编码加名称。
* 查询按编码精确匹配 c_destination。加载失败时清空选项并提示。
*/
loadDestinationOptions () {
if (this.destinationOptionsLoading) {
return
}
this.destinationOptionsLoading = true
searchPortList({ isDestinationPort: 'Y' }).then(({ data }) => {
if (!data || data.code !== 0) {
throw new Error((data && data.msg) || '加载目的港失败')
}
const rows = Array.isArray(data.rows) ? data.rows : []
this.destinationOptions = rows
.filter(row => row && String(row.portCode || '').trim())
.map(row => {
const portCode = String(row.portCode).trim()
const portName = String(row.portName || '').trim()
return {
label: portName && portName !== portCode ? `${portCode} ${portName}` : portCode,
value: portCode
}
})
}).catch(error => {
this.destinationOptions = []
this.$message.error(error.message || '加载目的港失败')
}).finally(() => {
this.destinationOptionsLoading = false
})
}
}
}

127
src/views/modules/order/poOrder_search.vue

@ -1,45 +1,19 @@
<template>
<div class="mod-config">
<com-po-order-customer-picker
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
<!-- 查询条件 -->
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="PO No">
<el-input v-model="searchData.poNo" clearable style="width: 140px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="searchData.orderType" placeholder="请选择" style="width: 120px" clearable>
<el-option
v-for="item in poOrderTypeSearchOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(2017)"><a href="javascript:void(0)">Part No</a></span>
<el-input v-model="searchData.partNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(520)"><a href="javascript:void(0)">供应商编码</a></span>
<el-input v-model="searchData.supplierNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="searchData.sku" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="Status">
<el-select v-model="searchData.status" placeholder="请选择" style="width:180px" clearable filterable @visible-change="onPoStatusDropdownVisible">
<el-option label="全部" value=""></el-option>
<el-option
v-for="item in poOrderStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-form>
<com-po-order-search-bar
:search-data="searchData"
:ship-method-options="shipMethodOptions"
:destination-options="destinationOptions"
:status-options="poOrderStatusOptions"
@search="handleSearch"
@status-visible="onPoStatusDropdownVisible">
<com-po-order-customer-picker
slot="leading"
embedded
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
</com-po-order-search-bar>
<el-form :inline="true" label-position="top" style="margin-top:10px">
<el-form-item>
@ -117,7 +91,6 @@
@refresh-status-options="loadPoStatusMappings"
@query="handleSearch" />
<ChooselistEam ref="eamList" @getBaseData="getEamData" />
</div>
</template>
@ -126,6 +99,7 @@ import { searchPoDetailPage, searchPoDetailAdvancedPage, getPoFieldSchema } from
import {
createAdvancedQueryData,
createAdvancedQueryDataFromSchema,
createPoOrderSearchData,
buildPoOrderQueryParams
} from './poOrderAdvancedQueryHelper.js'
import {
@ -139,22 +113,23 @@ import InspectionDetailList from './com_inspectionDetailList.vue'
import PoPartAttribute from './com_poPartAttribute.vue'
import PoOrderDetail from './com_poOrderDetail.vue'
import PoOrderAdvancedQuery from './com_poOrderAdvancedQuery.vue'
import ChooselistEam from '@/views/modules/common/Chooselist_eam.vue'
import ComPoOrderCustomerPicker from './com_poOrder_CustomerPicker.vue'
import ComPoOrderSearchBar from './com_poOrderSearchBar.vue'
import poOrderStatusMappingMixin from './poOrderStatusMappingMixin.js'
import { PO_ORDER_TYPE_OPTIONS, formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import poOrderSearchOptionsMixin from './poOrderSearchOptionsMixin.js'
import { formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import { searchPartInfo } from '@/api/part/partInfo.js'
export default {
mixins: [poOrderStatusMappingMixin], // rqrq - 列表、下拉和导出共用状态映射
mixins: [poOrderStatusMappingMixin, poOrderSearchOptionsMixin], // rqrq - 状态映射与顶部筛选下拉共用
components: {
LogisticsPoList,
InspectionDetailList,
PoPartAttribute,
PoOrderDetail,
PoOrderAdvancedQuery,
ChooselistEam,
ComPoOrderCustomerPicker
ComPoOrderCustomerPicker,
ComPoOrderSearchBar
},
name: 'PoOrderQuery',
data() {
@ -169,26 +144,11 @@ export default {
dataList: [],
currentRow: {},
advancedQueryVisible: false,
eamTagNo: '',
poOrderTypeSearchOptions: [{ label: '全部', value: '' }, ...PO_ORDER_TYPE_OPTIONS],
/** 高级查询条件对象(查询/导出均读取;仅弹窗内「重置」可清空) */
advancedQueryData: createAdvancedQueryData(),
fieldSchemaFields: [],
baseColumnList: null,
searchData: {
site: this.$store.state.user.site,
customer: '',
buyer: '',
poNo: '',
orderType: '',
partNo: '',
supplierNo: '',
sku: '',
status: '',
supplierName: '',
feeDateStart: '',
feeDateEnd: ''
},
searchData: createPoOrderSearchData(this.$store.state.user.site),
// 列配置(与原始页面保持一致,但隐藏编辑相关列)
columnList: [
{
@ -718,52 +678,13 @@ export default {
})
},
/** 外部重置:仅清空顶部基础条件,不清 advancedQueryData */
/** 重置顶部筛选,保留当前 Customer。不清高级查询条件。 */
resetSearch() {
const currentCustomer = this.searchData.customer
this.searchData = {
site: this.$store.state.user.site,
customer: currentCustomer,
buyer: '',
poNo: '',
orderType: '',
partNo: '',
supplierNo: '',
sku: '',
status: '',
supplierName: '',
feeDateStart: '',
feeDateEnd: ''
}
this.searchData = createPoOrderSearchData(this.$store.state.user.site, currentCustomer)
this.pageIndex = 1
this.getDataList()
},
openSearchBaseList (val) {
this.eamTagNo = val
let strVal = ''
let conSql = ''
if (val === 520) {
strVal = this.searchData.supplierNo || ''
conSql = " and supplier_no <> '' "
} else if (val === 2017) {
strVal = this.searchData.partNo || ''
conSql = " and part_no <> '' "
}
this.$nextTick(() => {
this.$refs.eamList.init(val, strVal, conSql)
})
},
getEamData (val) {
if (this.eamTagNo === 520) {
this.searchData.supplierNo = val.supplier_no || val.code || ''
this.searchData.supplierName = val.supplier_name || val.name || ''
} else if (this.eamTagNo === 2017) {
this.searchData.partNo = val.part_no || val.code || ''
}
this.eamTagNo = ''
},
// 导出
exportExcel () {
if (!this.searchData.customer) {

127
src/views/modules/order/poOrder_search_en.vue

@ -1,45 +1,19 @@
<template>
<div class="mod-config">
<com-po-order-customer-picker
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
<!-- Search Conditions -->
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="PO No">
<el-input v-model="searchData.poNo" clearable style="width: 140px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="Order Type">
<el-select v-model="searchData.orderType" placeholder="Please select" style="width: 120px" clearable>
<el-option
v-for="item in poOrderTypeSearchOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(2017)"><a href="javascript:void(0)">Part No</a></span>
<el-input v-model="searchData.partNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="openSearchBaseList(520)"><a href="javascript:void(0)">Supplier Code</a></span>
<el-input v-model="searchData.supplierNo" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="searchData.sku" clearable style="width: 120px" @keyup.enter.native="handleSearch"></el-input>
</el-form-item>
<el-form-item label="Status">
<el-select v-model="searchData.status" placeholder="Please select" style="width:180px" clearable filterable @visible-change="onPoStatusDropdownVisible">
<el-option label="All" value=""></el-option>
<el-option
v-for="item in poOrderStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-form>
<com-po-order-search-bar
:search-data="searchData"
:ship-method-options="shipMethodOptions"
:destination-options="destinationOptions"
:status-options="poOrderStatusOptions"
@search="handleSearch"
@status-visible="onPoStatusDropdownVisible">
<com-po-order-customer-picker
slot="leading"
embedded
:site="searchData.site"
v-model="searchData.customer"
@change="onSessionCustomerChange" />
</com-po-order-search-bar>
<el-form :inline="true" label-position="top" style="margin-top:10px">
<el-form-item>
@ -118,7 +92,6 @@
@refresh-status-options="loadPoStatusMappings"
@query="handleSearch" />
<ChooselistEam ref="eamList" @getBaseData="getEamData" />
</div>
</template>
@ -127,6 +100,7 @@ import { searchPoDetailPage, searchPoDetailAdvancedPage, getPoFieldSchema } from
import {
createAdvancedQueryData,
createAdvancedQueryDataFromSchema,
createPoOrderSearchData,
buildPoOrderQueryParams
} from './poOrderAdvancedQueryHelper.js'
import {
@ -140,22 +114,23 @@ import InspectionDetailList from './com_inspectionDetailList.vue'
import PoPartAttribute from './com_poPartAttribute.vue'
import PoOrderDetail from './com_poOrderDetail.vue'
import PoOrderAdvancedQuery from './com_poOrderAdvancedQuery.vue'
import ChooselistEam from '@/views/modules/common/Chooselist_eam.vue'
import ComPoOrderCustomerPicker from './com_poOrder_CustomerPicker.vue'
import ComPoOrderSearchBar from './com_poOrderSearchBar.vue'
import poOrderStatusMappingMixin from './poOrderStatusMappingMixin.js'
import { PO_ORDER_TYPE_OPTIONS, formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import poOrderSearchOptionsMixin from './poOrderSearchOptionsMixin.js'
import { formatPoOrderTypeLabel } from './poOrderTypeOptions.js'
import { searchPartInfo } from '@/api/part/partInfo.js'
export default {
mixins: [poOrderStatusMappingMixin], // rqrq - 列表、下拉和导出共用状态映射
mixins: [poOrderStatusMappingMixin, poOrderSearchOptionsMixin], // rqrq - 状态映射与顶部筛选下拉共用
components: {
LogisticsPoList,
InspectionDetailList,
PoPartAttribute,
PoOrderDetail,
PoOrderAdvancedQuery,
ChooselistEam,
ComPoOrderCustomerPicker
ComPoOrderCustomerPicker,
ComPoOrderSearchBar
},
name: 'PoOrderQueryEn',
data() {
@ -170,26 +145,11 @@ export default {
dataList: [],
currentRow: {},
advancedQueryVisible: false,
eamTagNo: '',
poOrderTypeSearchOptions: [{ label: 'All', value: '' }, ...PO_ORDER_TYPE_OPTIONS],
/** Advanced query object (read by search/export; only reset in dialog) */
advancedQueryData: createAdvancedQueryData(),
fieldSchemaFields: [],
baseColumnList: null,
searchData: {
site: this.$store.state.user.site,
customer: '',
buyer: '',
poNo: '',
orderType: '',
partNo: '',
supplierNo: '',
sku: '',
status: '',
supplierName: '',
feeDateStart: '',
feeDateEnd: ''
},
searchData: createPoOrderSearchData(this.$store.state.user.site),
// Column config (consistent with original page, hides edit related columns)
columnList: [
{
@ -719,52 +679,13 @@ export default {
})
},
/** External reset: only clears top basic conditions, not advancedQueryData */
/** 重置顶部筛选,保留当前 Customer。不清高级查询条件。 */
resetSearch() {
const currentCustomer = this.searchData.customer
this.searchData = {
site: this.$store.state.user.site,
customer: currentCustomer,
buyer: '',
poNo: '',
orderType: '',
partNo: '',
supplierNo: '',
sku: '',
status: '',
supplierName: '',
feeDateStart: '',
feeDateEnd: ''
}
this.searchData = createPoOrderSearchData(this.$store.state.user.site, currentCustomer)
this.pageIndex = 1
this.getDataList()
},
openSearchBaseList (val) {
this.eamTagNo = val
let strVal = ''
let conSql = ''
if (val === 520) {
strVal = this.searchData.supplierNo || ''
conSql = " and supplier_no <> '' "
} else if (val === 2017) {
strVal = this.searchData.partNo || ''
conSql = " and part_no <> '' "
}
this.$nextTick(() => {
this.$refs.eamList.init(val, strVal, conSql)
})
},
getEamData (val) {
if (this.eamTagNo === 520) {
this.searchData.supplierNo = val.supplier_no || val.code || ''
this.searchData.supplierName = val.supplier_name || val.name || ''
} else if (this.eamTagNo === 2017) {
this.searchData.partNo = val.part_no || val.code || ''
}
this.eamTagNo = ''
},
// Export
exportExcel () {
if (!this.searchData.customer) {

Loading…
Cancel
Save