|
|
|
@ -10,6 +10,9 @@ |
|
|
|
<el-form-item label="供应商名称" class="search-item"> |
|
|
|
<el-input v-model="searchData.supplierName" style="width: 250px" @keyup.enter.native="getMainData"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Planner" class="search-item"> |
|
|
|
<el-input v-model="searchData.planner" style="width: 120px" @keyup.enter.native="getMainData"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="申请日期" class="search-item"> |
|
|
|
<div class="date-range"> |
|
|
|
<el-date-picker v-model="searchData.requestDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始" style="width: 150px"/> |
|
|
|
@ -287,6 +290,13 @@ |
|
|
|
style="width: 100px" |
|
|
|
@keyup.enter.native="filterAddPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Planner"> |
|
|
|
<el-input |
|
|
|
v-model="addPoFilter.planner" |
|
|
|
clearable |
|
|
|
style="width: 100px" |
|
|
|
@keyup.enter.native="filterAddPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" size="medium" style="margin-top:13px;" @click="filterAddPoList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
@ -309,6 +319,7 @@ |
|
|
|
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/> |
|
|
|
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="120" show-overflow-tooltip/> |
|
|
|
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/> |
|
|
|
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/> |
|
|
|
<el-table-column prop="qty" label="订单数量" header-align="center" align="right" width="80"/> |
|
|
|
<el-table-column prop="waitInspectQty" label="未验货数量" header-align="center" align="right" width="80"/> |
|
|
|
<el-table-column label="此次验货数量" header-align="center" align="center" width="150"> |
|
|
|
@ -469,6 +480,13 @@ |
|
|
|
style="width: 200px" |
|
|
|
@keyup.enter.native="searchOrderSupplierByPo"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Planner"> |
|
|
|
<el-input |
|
|
|
v-model="orderSupplierSearch.planner" |
|
|
|
clearable |
|
|
|
style="width: 140px" |
|
|
|
@keyup.enter.native="searchOrderSupplierByPo"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" @click="searchOrderSupplierByPo">查询</el-button> |
|
|
|
<el-button @click="resetOrderSupplierSearch">重置</el-button> |
|
|
|
@ -487,6 +505,7 @@ |
|
|
|
:default-sort="{ prop: 'crd', order: 'descending' }"> |
|
|
|
<el-table-column prop="supplierNo" label="供应商编码" header-align="center" align="left" min-width="120" fixed="left" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="supplierName" label="供应商名称" header-align="center" align="left" min-width="180" fixed="left" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" min-width="120" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" min-width="80" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="140" show-overflow-tooltip /> |
|
|
|
@ -624,7 +643,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
}, |
|
|
|
selectedPoList: [], |
|
|
|
poSupplierDialogVisible: false, |
|
|
|
@ -651,7 +671,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
}, |
|
|
|
pendingAutoSelectPoRow: null, |
|
|
|
// 上传相关 |
|
|
|
@ -663,6 +684,7 @@ export default { |
|
|
|
requestNo: '', |
|
|
|
supplierNo: '', |
|
|
|
supplierName: '', |
|
|
|
planner: '', |
|
|
|
status: '', |
|
|
|
qcOperator: '', |
|
|
|
createBy: '', |
|
|
|
@ -771,6 +793,24 @@ export default { |
|
|
|
status: true, |
|
|
|
fixed: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: this.functionId, |
|
|
|
serialNumber: 'InspectionTable1Planner', |
|
|
|
tableId: 'InspectionTable1', |
|
|
|
tableName: '检验申请单', |
|
|
|
columnProp: 'planner', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: 'Planner', |
|
|
|
columnWidth: '120', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: this.functionId, |
|
|
|
@ -1112,7 +1152,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.poSupplierDialogVisible = false |
|
|
|
this.poSupplierLoading = false |
|
|
|
@ -1138,7 +1179,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.pendingAutoSelectPoRow = null |
|
|
|
if (this.$refs.addFormData) { |
|
|
|
@ -1294,7 +1336,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.poSupplierDialogVisible = false |
|
|
|
this.orderSupplierDialogVisible = false |
|
|
|
@ -1357,7 +1400,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.loadOrderSupplierList() |
|
|
|
}, |
|
|
|
@ -1379,7 +1423,8 @@ export default { |
|
|
|
item: this.orderSupplierSearch.item || '', |
|
|
|
sku: this.orderSupplierSearch.sku || '', |
|
|
|
partDesc: this.orderSupplierSearch.partDesc || '', |
|
|
|
supplierName: this.orderSupplierSearch.supplierName || '' |
|
|
|
supplierName: this.orderSupplierSearch.supplierName || '', |
|
|
|
planner: this.orderSupplierSearch.planner || '' |
|
|
|
} |
|
|
|
this.orderSupplierLoading = true |
|
|
|
queryPoSupplierOrderPage(params).then(({ data }) => { |
|
|
|
@ -1388,6 +1433,7 @@ export default { |
|
|
|
...item, |
|
|
|
supplierNo: item.supplierNo || item.supplier_no || '', |
|
|
|
supplierName: item.supplierName || item.supplier_name || '', |
|
|
|
planner: item.planner || '', |
|
|
|
crd: item.crd ? String(item.crd).split(' ')[0] : '' |
|
|
|
})) |
|
|
|
this.orderSupplierList = list |
|
|
|
@ -1430,7 +1476,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.orderSupplierPageIndex = 1 |
|
|
|
this.loadOrderSupplierList() |
|
|
|
@ -1509,6 +1556,7 @@ export default { |
|
|
|
...item, |
|
|
|
supplierNo: item.supplierNo || item.supplier_no || this.addFormData.supplierNo || '', |
|
|
|
supplierName: item.supplierName || item.supplier_name || this.addFormData.supplierName || '', |
|
|
|
planner: item.planner || '', |
|
|
|
inspectQty: item.waitInspectQty || 0, // 默认值为未验货数量 |
|
|
|
shipMethod: item.shipMethod || '',// 运输方式 |
|
|
|
crd: item.crd ? item.crd.split(' ')[0] : '' |
|
|
|
@ -1544,6 +1592,7 @@ export default { |
|
|
|
const skuKeyword = (filter.sku || '').toLowerCase().trim() |
|
|
|
const partDescKeyword = (filter.partDesc || '').toLowerCase().trim() |
|
|
|
const supplierNameKeyword = (filter.supplierName || '').toLowerCase().trim() |
|
|
|
const plannerKeyword = (filter.planner || '').toLowerCase().trim() |
|
|
|
|
|
|
|
if (orderNoKeyword) { |
|
|
|
result = result.filter(item => { |
|
|
|
@ -1567,6 +1616,9 @@ export default { |
|
|
|
if (supplierNameKeyword) { |
|
|
|
result = result.filter(item => String(item.supplierName || '').toLowerCase().includes(supplierNameKeyword)) |
|
|
|
} |
|
|
|
if (plannerKeyword) { |
|
|
|
result = result.filter(item => String(item.planner || '').toLowerCase().includes(plannerKeyword)) |
|
|
|
} |
|
|
|
this.filteredPoList = result |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1578,7 +1630,8 @@ export default { |
|
|
|
item: '', |
|
|
|
sku: '', |
|
|
|
partDesc: '', |
|
|
|
supplierName: '' |
|
|
|
supplierName: '', |
|
|
|
planner: '' |
|
|
|
} |
|
|
|
this.filterAddPoList() |
|
|
|
}, |
|
|
|
|
