From 7f8d835db5d22a8a2ab14a3c83fed25a5b96058b Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 6 Nov 2024 13:28:57 +0800 Subject: [PATCH] 1 --- .../soIssueNotify/newSoIssueNotify.vue | 179 +++++++++--------- .../soIssueNotify/searchIssureNotify.vue | 10 +- .../soIssueNotify/searchIssureNotifyForCK.vue | 44 +---- 3 files changed, 101 insertions(+), 132 deletions(-) diff --git a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue index aaba1f1..0f6a373 100644 --- a/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue +++ b/src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue @@ -845,7 +845,7 @@ functionId: 701001, serialNumber: '701001Table4ComponentPartNo', tableId: "701001Table4", - tableName: "申请单材料明细表", + tableName: "非BOM材料明细", columnProp: "componentPartNo", headerAlign: "center", align: "center", @@ -862,7 +862,7 @@ functionId: 701001, serialNumber: '701001Table4PartDesc', tableId: "701001Table4", - tableName: "申请单材料明细表", + tableName: "非BOM材料明细", columnProp: "partDesc", headerAlign: "center", align: "left", @@ -879,7 +879,7 @@ functionId: 701001, serialNumber: '701001Table4QtyToIssue', tableId: "701001Table4", - tableName: "申请单材料明细表", + tableName: "非BOM材料明细", columnProp: "qtyToIssue", headerAlign: "center", align: "right", @@ -896,7 +896,7 @@ functionId: 701001, serialNumber: '701001Table4Remark', tableId: "701001Table4", - tableName: "申请单材料明细表", + tableName: "非BOM材料明细", columnProp: "remark", headerAlign: "center", align: "left", @@ -924,9 +924,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1ItemNo', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1ItemNo', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'itemNo', headerAlign: "center", @@ -942,9 +942,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1SeqNo', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1SeqNo', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'seqNo', headerAlign: "center", @@ -960,9 +960,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1SOOrderNo', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1SOOrderNo', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'sOOrderNo', headerAlign: "center", @@ -978,9 +978,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1OpsItemNo', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1OpsItemNo', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'opsItemNo', headerAlign: "center", @@ -996,9 +996,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1ItemDesc', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1ItemDesc', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'itemDesc', headerAlign: "center", @@ -1014,9 +1014,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1LocationNo', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1LocationNo', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'locationNo', headerAlign: "center", @@ -1033,9 +1033,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1NeedDate', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1NeedDate', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'needDate', headerAlign: "center", @@ -1052,9 +1052,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table1IssureQty', - tableId: "701001002Table1", + functionId: 701001, + serialNumber: '701001Table1IssureQty', + tableId: "701001Table1", tableName: "领料申请派工单子表", columnProp: 'issureQty', headerAlign: "center", @@ -1073,9 +1073,9 @@ columnList2: [ { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2Orderno', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2Orderno', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'orderno', headerAlign: "center", @@ -1091,9 +1091,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2Itemno', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2Itemno', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'itemno', headerAlign: "center", @@ -1109,9 +1109,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2ItemDesc', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2ItemDesc', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'itemDesc', headerAlign: "center", @@ -1127,9 +1127,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2Seqno', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2Seqno', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'seqno', headerAlign: "center", @@ -1145,9 +1145,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2PartNo', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2PartNo', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'partNo', headerAlign: "center", @@ -1163,9 +1163,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2Qtyrequired', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2Qtyrequired', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'qtyrequired', headerAlign: "center", @@ -1181,9 +1181,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2Qtyreported', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2Qtyreported', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'qtyreported', headerAlign: "center", @@ -1199,9 +1199,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2SScheduleddate', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2SScheduleddate', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'sScheduleddate', headerAlign: "center", @@ -1217,9 +1217,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2SWorkcenterno', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2SWorkcenterno', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'sWorkcenterno', headerAlign: "center", @@ -1235,9 +1235,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2WorkCenterDesc', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2WorkCenterDesc', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'workCenterDesc', headerAlign: "center", @@ -1253,9 +1253,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2SResourceid', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2SResourceid', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'sResourceid', headerAlign: "center", @@ -1271,9 +1271,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2ResourceDesc', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2ResourceDesc', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'resourceDesc', headerAlign: "center", @@ -1289,9 +1289,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table2OperatorDesc', - tableId: "701001002Table2", + functionId: 701001, + serialNumber: '701001Table2OperatorDesc', + tableId: "701001Table2", tableName: "查询派工单", columnProp: 'operatorDesc', headerAlign: "center", @@ -1309,9 +1309,9 @@ columnList3: [ { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3ComponentPartNo', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3ComponentPartNo', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'componentPartNo', headerAlign: "center", @@ -1327,9 +1327,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3PartDesc', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3PartDesc', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'partDesc', headerAlign: "center", @@ -1345,9 +1345,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3QtyRequired', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3QtyRequired', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'qtyRequired', headerAlign: "center", @@ -1363,9 +1363,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3QtyOnHand', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3QtyOnHand', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'qtyOnHand', headerAlign: "center", @@ -1381,9 +1381,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3StockQty', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3StockQty', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'stockQty', headerAlign: "center", @@ -1399,9 +1399,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3QtyToIssue', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3QtyToIssue', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'qtyToIssue', headerAlign: "center", @@ -1417,9 +1417,9 @@ }, { userId: this.$store.state.user.name, - functionId: 701001002, - serialNumber: '701001002Table3Remark', - tableId: "701001002Table3", + functionId: 701001, + serialNumber: '701001Table3Remark', + tableId: "701001Table3", tableName: "领料申请BOM子表", columnProp: 'remark', headerAlign: "center", @@ -2250,6 +2250,9 @@ this.authUpdate = !updateFlag this.authDelete = !deleteFlag }, + + + //动态列结束 } } diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue index bd0acec..06e0db0 100644 --- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue +++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue @@ -932,7 +932,7 @@ { userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table3IssueType', + serialNumber: '701002Table4IssueType', tableId: "701002Table4", tableName: "申请单材料明细表", columnProp: "issueType", @@ -950,7 +950,7 @@ { userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table3ComponentPartNo', + serialNumber: '701002Table4ComponentPartNo', tableId: "701002Table4", tableName: "申请单材料明细表", columnProp: "componentPartNo", @@ -967,7 +967,7 @@ },{ userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table3PartDesc', + serialNumber: '701002Table4PartDesc', tableId: "701002Table4", tableName: "申请单材料明细表", columnProp: "partDesc", @@ -984,7 +984,7 @@ },{ userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table3QtyToIssue', + serialNumber: '701002Table4QtyToIssue', tableId: "701002Table4", tableName: "申请单材料明细表", columnProp: "qtyToIssue", @@ -1001,7 +1001,7 @@ },{ userId: this.$store.state.user.name, functionId: 701002, - serialNumber: '701002Table3QtyToIssueOriginal', + serialNumber: '701002Table4QtyToIssueOriginal', tableId: "701002Table4", tableName: "申请单材料明细表", columnProp: "qtyToIssueOriginal", diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue index f7c029f..f48186a 100644 --- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue +++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue @@ -400,40 +400,6 @@ status: true, fixed: '', columnWidth: 120 - // },{ - // userId: this.$store.state.user.name, - // functionId: 701003, - // serialNumber: '701003Table1PlanIssueDate', - // tableId: "701003Table1", - // tableName: "领料申请主表", - // columnProp: "planIssueDate", - // headerAlign: "center", - // align: "left", - // columnLabel: "计划领料日期", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 100 - // },{ - // userId: this.$store.state.user.name, - // functionId: 701003, - // serialNumber: '701003Table1RealIssueDate', - // tableId: "701003Table1", - // tableName: "领料申请主表", - // columnProp: "realIssueDate", - // headerAlign: "center", - // align: "left", - // columnLabel: "实际领料日期", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 100 },{ userId: this.$store.state.user.name, functionId: 701003, @@ -876,7 +842,7 @@ { userId: this.$store.state.user.name, functionId: 701003, - serialNumber: '701003Table3IssueType', + serialNumber: '701003Table4IssueType', tableId: "701003Table4", tableName: "申请单材料明细表", columnProp: "issueType", @@ -894,7 +860,7 @@ { userId: this.$store.state.user.name, functionId: 701003, - serialNumber: '701003Table3ComponentPartNo', + serialNumber: '701003Table4ComponentPartNo', tableId: "701003Table4", tableName: "申请单材料明细表", columnProp: "componentPartNo", @@ -911,7 +877,7 @@ },{ userId: this.$store.state.user.name, functionId: 701003, - serialNumber: '701003Table3PartDesc', + serialNumber: '701003Table4PartDesc', tableId: "701003Table4", tableName: "申请单材料明细表", columnProp: "partDesc", @@ -928,7 +894,7 @@ },{ userId: this.$store.state.user.name, functionId: 701003, - serialNumber: '701003Table3QtyToIssue', + serialNumber: '701003Table4QtyToIssue', tableId: "701003Table4", tableName: "申请单材料明细表", columnProp: "qtyToIssue", @@ -945,7 +911,7 @@ },{ userId: this.$store.state.user.name, functionId: 701003, - serialNumber: '701003Table3QtyToIssueOriginal', + serialNumber: '701003Table4QtyToIssueOriginal', tableId: "701003Table4", tableName: "申请单材料明细表", columnProp: "qtyToIssueOriginal",