diff --git a/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue b/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue index 04e6bb3..37dc644 100644 --- a/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue +++ b/src/views/modules/haianWarehouse/automatedWarehouse/notifyDetailQuery54.vue @@ -119,8 +119,8 @@ - - + + diff --git a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue index 4c7a29a..0861773 100644 --- a/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue +++ b/src/views/modules/haianWarehouse/noOrderIssue/noOrderNotification54.vue @@ -1417,22 +1417,23 @@ export default { columnWidth: 80, }, { + // 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq userId: this.$store.state.user.name, functionId: 444002, - serialNumber: '444002Table6BomItemNo', + serialNumber: '444002Table6ComponentPartNo', tableId: '444002Table6', tableName: '预定标签清单表', - columnProp: 'bomItemNo', + columnProp: 'componentPartNo', headerAlign: 'center', - align: 'right', - columnLabel: '订单物料行号', + align: 'left', + columnLabel: '料号', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 110, + columnWidth: 120, }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue index daad581..0b0141a 100644 --- a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue @@ -1408,22 +1408,23 @@ export default { fixed: '', columnWidth: 80 },{ + // 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table6BOMItemNo', + serialNumber: '701002Table6ComponentPartNo', tableId: "701002Table6", tableName: "预定标签清单表", - columnProp: "bomItemNo", + columnProp: "componentPartNo", headerAlign: "center", - align: "right", - columnLabel: "订单物料行号", + align: "left", + columnLabel: "料号", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 120 },{ userId: this.$store.state.user.name, functionId: 701002, diff --git a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue index 9159cc0..0a888d8 100644 --- a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue +++ b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue @@ -1408,22 +1408,23 @@ export default { fixed: '', columnWidth: 80 },{ + // 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table6BOMItemNo', + serialNumber: '701002Table6ComponentPartNo', tableId: "701002Table6", tableName: "预定标签清单表", - columnProp: "bomItemNo", + columnProp: "componentPartNo", headerAlign: "center", - align: "right", - columnLabel: "订单物料行号", + align: "left", + columnLabel: "料号", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 120 },{ userId: this.$store.state.user.name, functionId: 701002, diff --git a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue index 08de011..052ad63 100644 --- a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue +++ b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue @@ -1408,22 +1408,23 @@ export default { fixed: '', columnWidth: 80 },{ + // 预定标签清单按标签料号展示;订单物料行号仅保留在返回数据中供业务关联 - rqrq userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table6BOMItemNo', + serialNumber: '701002Table6ComponentPartNo', tableId: "701002Table6", tableName: "预定标签清单表", - columnProp: "bomItemNo", + columnProp: "componentPartNo", headerAlign: "center", - align: "right", - columnLabel: "订单物料行号", + align: "left", + columnLabel: "料号", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 120 },{ userId: this.$store.state.user.name, functionId: 701002, diff --git a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue index 21a3312..41ffcd0 100644 --- a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue +++ b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue @@ -51,6 +51,13 @@ + + + + + + + 查询 @@ -351,6 +358,8 @@ export default { locationCode: '', area: '', inStockFlag: '', + // 空值不筛选;Y/N由托盘列表SQL按haian_pallet.empty_flag精确查询 - rqrq + emptyFlag: '', partNo: '', batchNo: '', page: 1, @@ -454,6 +463,7 @@ export default { this.queryData.palletType = '' this.queryData.area = '' this.queryData.inStockFlag = '' + this.queryData.emptyFlag = '' // 切换主工厂时清除旧工厂的空托盘筛选状态 - rqrq this.palletFamilyOptions = [] this.palletTypeOptions = [] this.areaOptions = [] @@ -631,6 +641,8 @@ export default { locationCode: '', area: '', inStockFlag: '', + // 重置为空表示不限制空托盘,后续列表及导出请求沿用此值 - rqrq + emptyFlag: '', partNo: '', batchNo: '', page: 1,