|
|
@ -892,6 +892,11 @@ |
|
|
</el-input-number> |
|
|
</el-input-number> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column label="原运输方式" header-align="center" align="center" width="100"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<span>{{ scope.row.origShipMethod }}</span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
<el-table-column label="运输方式" header-align="center" align="center" width="100"> |
|
|
<el-table-column label="运输方式" header-align="center" align="center" width="100"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%;"> |
|
|
<el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%;"> |
|
|
@ -904,6 +909,11 @@ |
|
|
</el-select> |
|
|
</el-select> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
|
|
|
<el-table-column label="原CRD" header-align="center" align="center" width="110"> |
|
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
<span>{{ scope.row.origCrd }}</span> |
|
|
|
|
|
</template> |
|
|
|
|
|
</el-table-column> |
|
|
<el-table-column label="CRD" header-align="center" align="center" width="160"> |
|
|
<el-table-column label="CRD" header-align="center" align="center" width="160"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
@ -1555,6 +1565,24 @@ export default { |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: false |
|
|
fixed: false |
|
|
}, |
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: this.functionId, |
|
|
|
|
|
serialNumber: 'InspectionTable1QcContact', |
|
|
|
|
|
tableId: 'InspectionTable1', |
|
|
|
|
|
tableName: '检验申请单', |
|
|
|
|
|
columnProp: 'qcContact', |
|
|
|
|
|
headerAlign: 'center', |
|
|
|
|
|
align: 'left', |
|
|
|
|
|
columnLabel: 'QC联系方式', |
|
|
|
|
|
columnWidth: '120', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: false |
|
|
|
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: this.functionId, |
|
|
functionId: this.functionId, |
|
|
@ -2405,6 +2433,11 @@ export default { |
|
|
partNo: this.addPoSearch.partNo || '', |
|
|
partNo: this.addPoSearch.partNo || '', |
|
|
sku: this.addPoSearch.sku || '', |
|
|
sku: this.addPoSearch.sku || '', |
|
|
partDesc: this.addPoSearch.partDesc || '', |
|
|
partDesc: this.addPoSearch.partDesc || '', |
|
|
|
|
|
// 选择PO明细弹窗筛选条件:交由后端做全量分页查询,避免只过滤当前页 - rqrq |
|
|
|
|
|
orderNo: this.addPoSelectFilter.orderNo || '', |
|
|
|
|
|
item: this.addPoSelectFilter.item || '', |
|
|
|
|
|
crdStart: this.addPoSelectFilter.crdStart || '', |
|
|
|
|
|
crdEnd: this.addPoSelectFilter.crdEnd || '', |
|
|
page: this.addPoSelectPageIndex, |
|
|
page: this.addPoSelectPageIndex, |
|
|
limit: this.addPoSelectPageSize |
|
|
limit: this.addPoSelectPageSize |
|
|
} |
|
|
} |
|
|
@ -2440,58 +2473,37 @@ export default { |
|
|
...row, |
|
|
...row, |
|
|
inspectQty: row.waitInspectQty || row.qty || 0, // 此次验货数量默认为未验货数量 |
|
|
inspectQty: row.waitInspectQty || row.qty || 0, // 此次验货数量默认为未验货数量 |
|
|
shipMethod: row.shipMethod || row.shipMothod || '', // 运输方式默认为PO中的运输方式(兼容拼写错误) |
|
|
shipMethod: row.shipMethod || row.shipMothod || '', // 运输方式默认为PO中的运输方式(兼容拼写错误) |
|
|
crd: row.crd || '' // CRD日期默认为PO中的CRD日期 |
|
|
|
|
|
|
|
|
crd: row.crd || '', // CRD日期默认为PO中的CRD日期 |
|
|
|
|
|
origShipMethod: row.shipMethod || row.shipMothod || '', // 原运输方式(订单值,只读对照) - rqrq |
|
|
|
|
|
origCrd: row.crd || '' // 原CRD(订单值,只读对照) - rqrq |
|
|
})) |
|
|
})) |
|
|
|
|
|
|
|
|
this.addPoSelectList = list |
|
|
this.addPoSelectList = list |
|
|
|
|
|
this.filteredAddPoSelectList = list |
|
|
this.addPoSelectTotal = pageData.totalCount || 0 |
|
|
this.addPoSelectTotal = pageData.totalCount || 0 |
|
|
this.addPoSelectPageIndex = pageData.currPage || this.addPoSelectPageIndex |
|
|
this.addPoSelectPageIndex = pageData.currPage || this.addPoSelectPageIndex |
|
|
this.addPoSelectPageSize = pageData.pageSize || this.addPoSelectPageSize |
|
|
this.addPoSelectPageSize = pageData.pageSize || this.addPoSelectPageSize |
|
|
} else { |
|
|
} else { |
|
|
this.addPoSelectList = [] |
|
|
this.addPoSelectList = [] |
|
|
|
|
|
this.filteredAddPoSelectList = [] |
|
|
this.addPoSelectTotal = 0 |
|
|
this.addPoSelectTotal = 0 |
|
|
this.$message.warning(data.msg || '加载PO列表失败') |
|
|
this.$message.warning(data.msg || '加载PO列表失败') |
|
|
} |
|
|
} |
|
|
}).catch(error => { |
|
|
}).catch(error => { |
|
|
console.error('加载PO列表失败:', error) |
|
|
console.error('加载PO列表失败:', error) |
|
|
this.addPoSelectList = [] |
|
|
this.addPoSelectList = [] |
|
|
|
|
|
this.filteredAddPoSelectList = [] |
|
|
this.addPoSelectTotal = 0 |
|
|
this.addPoSelectTotal = 0 |
|
|
this.$message.error('加载PO列表失败') |
|
|
this.$message.error('加载PO列表失败') |
|
|
}).finally(() => { |
|
|
}).finally(() => { |
|
|
this.filterAddPoSelectList() |
|
|
|
|
|
this.addPoSelectLoading = false |
|
|
this.addPoSelectLoading = false |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// 选择PO明细弹窗-前端筛选(与新增一致:PO、Item、D_CRD) |
|
|
|
|
|
|
|
|
// 选择PO明细弹窗-查询:按筛选条件重新向后端发起分页查询(从第一页开始)- rqrq |
|
|
filterAddPoSelectList () { |
|
|
filterAddPoSelectList () { |
|
|
let result = [...this.addPoSelectList] |
|
|
|
|
|
const filter = this.addPoSelectFilter || {} |
|
|
|
|
|
const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim() |
|
|
|
|
|
const itemKeyword = String(filter.item || '').toLowerCase().trim() |
|
|
|
|
|
const crdStart = String(filter.crdStart || '').trim() |
|
|
|
|
|
const crdEnd = String(filter.crdEnd || '').trim() |
|
|
|
|
|
|
|
|
|
|
|
if (orderNoKeyword) { |
|
|
|
|
|
result = result.filter(item => { |
|
|
|
|
|
const orderRef1 = String(item.orderRef1 || '').toLowerCase() |
|
|
|
|
|
const orderNo = String(item.orderNo || item.order_no || '').toLowerCase() |
|
|
|
|
|
return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword) |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
if (itemKeyword) { |
|
|
|
|
|
result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword)) |
|
|
|
|
|
} |
|
|
|
|
|
if (crdStart || crdEnd) { |
|
|
|
|
|
result = result.filter(item => { |
|
|
|
|
|
const crd = String(item.crd || '').slice(0, 10) |
|
|
|
|
|
if (!crd) return false |
|
|
|
|
|
if (crdStart && crd < crdStart) return false |
|
|
|
|
|
if (crdEnd && crd > crdEnd) return false |
|
|
|
|
|
return true |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
this.filteredAddPoSelectList = result |
|
|
|
|
|
|
|
|
this.addPoSelectPageIndex = 1 |
|
|
|
|
|
this.loadAddPoSelectList() |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// 搜索新增PO列表 |
|
|
// 搜索新增PO列表 |
|
|
|