From 9c5ef6d4a6e051a711a37227ae6a9a02e80cde00 Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Mon, 1 Jul 2024 16:11:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/material/seekByNum.vue | 22 +++++++++---------- src/views/modules/material/seekInvByRolls.vue | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/modules/material/seekByNum.vue b/src/views/modules/material/seekByNum.vue index d7dbb07..ce0d261 100644 --- a/src/views/modules/material/seekByNum.vue +++ b/src/views/modules/material/seekByNum.vue @@ -183,7 +183,7 @@ export default { serialNumber: '200005TableWarehouseId', tableId: "200005Table", tableName: "仓位编码", - columnWidth: 130, + columnWidth: 145, columnProp: 'warehouseID', headerAlign: 'left', align: "left", @@ -201,7 +201,7 @@ export default { serialNumber: '200005TablePartNo', tableId: "200005Table", tableName: "物料编码", - columnWidth: 130, + columnWidth: 145, columnProp: 'partNo', headerAlign: 'left', align: "left", @@ -219,7 +219,7 @@ export default { serialNumber: '200005TablePartDesc', tableId: "200005Table", tableName: "料号描述", - columnWidth: 130, + columnWidth: 145, columnProp: 'partDesc', headerAlign: 'left', align: "left", @@ -237,7 +237,7 @@ export default { serialNumber: '200005TableNum', tableId: "200005Table", tableName: "卷数量", - columnWidth: 130, + columnWidth: 145, columnProp: 'num', headerAlign: 'right', align: "right", @@ -255,7 +255,7 @@ export default { serialNumber: '200005TableQtyOnHand', tableId: "200005Table", tableName: "库存数量", - columnWidth: 130, + columnWidth: 145, columnProp: 'qtyOnHand', headerAlign: 'right', align: "right", @@ -274,7 +274,7 @@ export default { serialNumber: '200005TableBatchNo', tableId: "200005Table", tableName: "批号", - columnWidth: 130, + columnWidth: 145, columnProp: 'batchNo', headerAlign: 'left', align: "left", @@ -292,7 +292,7 @@ export default { serialNumber: '200005TableLocationID', tableId: "200005Table", tableName: "库位", - columnWidth: 130, + columnWidth: 145, columnProp: 'locationID', headerAlign: 'left', align: "left", @@ -310,7 +310,7 @@ export default { serialNumber: '200005TableManufactureDate', tableId: "200005Table", tableName: "生产日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'manufactureDate', headerAlign: 'center', align: "center", @@ -328,7 +328,7 @@ export default { serialNumber: '200005TableFirstInDate', tableId: "200005Table", tableName: "首次入库日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'FirstInDate', headerAlign: 'center', align: "center", @@ -346,7 +346,7 @@ export default { serialNumber: '200005TableExpiredDate', tableId: "200005Table", tableName: "失效日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'expiredDate', headerAlign: 'center', align: "center", @@ -364,7 +364,7 @@ export default { serialNumber: '200005TableDaysUntilExpired', tableId: "200005Table", tableName: "剩余有效期天数", - columnWidth: 130, + columnWidth: 140, columnProp: 'daysUntilExpired', headerAlign: 'right', align: "right", diff --git a/src/views/modules/material/seekInvByRolls.vue b/src/views/modules/material/seekInvByRolls.vue index 3d9fa04..bf3b042 100644 --- a/src/views/modules/material/seekInvByRolls.vue +++ b/src/views/modules/material/seekInvByRolls.vue @@ -157,7 +157,7 @@ export default { serialNumber: '200005TableWarehouseId', tableId: "200005Table", tableName: "仓位编码", - columnWidth: 130, + columnWidth: 142, columnProp: 'warehouseID', headerAlign: 'left', align: "left", @@ -175,7 +175,7 @@ export default { serialNumber: '200005TablePartNo', tableId: "200005Table", tableName: "物料编码", - columnWidth: 130, + columnWidth: 142, columnProp: 'partNo', headerAlign: 'left', align: "left", @@ -193,7 +193,7 @@ export default { serialNumber: '200005TablePartDesc', tableId: "200005Table", tableName: "料号描述", - columnWidth: 130, + columnWidth: 142, columnProp: 'partDesc', headerAlign: 'left', align: "left", @@ -211,7 +211,7 @@ export default { serialNumber: '200004TableRollNo', tableId: "200004Table", tableName: "卷号", - columnWidth: 100, + columnWidth: 145, columnProp: 'rollNo', headerAlign: 'center', align: "center", @@ -229,7 +229,7 @@ export default { serialNumber: '200005TableQtyOnHand', tableId: "200005Table", tableName: "库存数量", - columnWidth: 130, + columnWidth: 145, columnProp: 'qtyOnHand', headerAlign: 'right', align: "right", @@ -248,7 +248,7 @@ export default { serialNumber: '200005TableBatchNo', tableId: "200005Table", tableName: "批号", - columnWidth: 130, + columnWidth: 145, columnProp: 'batchNo', headerAlign: 'left', align: "left", @@ -266,7 +266,7 @@ export default { serialNumber: '200005TableLocationID', tableId: "200005Table", tableName: "库位", - columnWidth: 130, + columnWidth: 145, columnProp: 'locationID', headerAlign: 'left', align: "left", @@ -284,7 +284,7 @@ export default { serialNumber: '200005TableManufactureDate', tableId: "200005Table", tableName: "生产日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'manufactureDate', headerAlign: 'center', align: "center", @@ -302,7 +302,7 @@ export default { serialNumber: '200005TableFirstInDate', tableId: "200005Table", tableName: "首次入库日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'FirstInDate', headerAlign: 'center', align: "center", @@ -320,7 +320,7 @@ export default { serialNumber: '200005TableExpiredDate', tableId: "200005Table", tableName: "失效日期", - columnWidth: 130, + columnWidth: 145, columnProp: 'expiredDate', headerAlign: 'center', align: "center", @@ -338,7 +338,7 @@ export default { serialNumber: '200005TableDaysUntilExpired', tableId: "200005Table", tableName: "剩余有效期天数", - columnWidth: 130, + columnWidth: 145, columnProp: 'daysUntilExpired', headerAlign: 'right', align: "right", From e0e34cfd2c8d59f6e5529e92ced2d3a94b2be821 Mon Sep 17 00:00:00 2001 From: "wenkuan.shi" Date: Mon, 1 Jul 2024 17:43:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/material/seekByRolls.vue | 4 ++++ src/views/modules/material/seekByTrans.vue | 22 ++++--------------- src/views/modules/material/seekInvByRolls.vue | 7 ++++++ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/views/modules/material/seekByRolls.vue b/src/views/modules/material/seekByRolls.vue index 42d99e1..7ebc0b9 100644 --- a/src/views/modules/material/seekByRolls.vue +++ b/src/views/modules/material/seekByRolls.vue @@ -17,6 +17,10 @@ + + + + 查询 diff --git a/src/views/modules/material/seekByTrans.vue b/src/views/modules/material/seekByTrans.vue index d1e0759..b7ca2b9 100644 --- a/src/views/modules/material/seekByTrans.vue +++ b/src/views/modules/material/seekByTrans.vue @@ -13,6 +13,10 @@ + + + + 查询 @@ -272,24 +276,6 @@ export default { status: true, fixed: '', }, - // { - // userId: this.$store.state.user.name, - // functionId: 200003, - // serialNumber: '200003TableRollNo', - // tableId: "200003Table", - // tableName: "卷号", - // columnWidth: 100, - // columnProp: 'rollNo', - // headerAlign: 'center', - // align: "center", - // columnLabel: '卷号', - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // }, { userId: this.$store.state.user.name, functionId: 200003, diff --git a/src/views/modules/material/seekInvByRolls.vue b/src/views/modules/material/seekInvByRolls.vue index bf3b042..d8a3104 100644 --- a/src/views/modules/material/seekInvByRolls.vue +++ b/src/views/modules/material/seekInvByRolls.vue @@ -17,6 +17,13 @@ + + + + + + + From fa723dfff48063c5a6f3917cbfe92ba2dbb91a7e Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Mon, 1 Jul 2024 17:58:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduleReport/com_separate_roll.vue | 31 ++++++- .../modules/scheduleReport/produce_order.vue | 90 ------------------- 2 files changed, 30 insertions(+), 91 deletions(-) diff --git a/src/views/modules/scheduleReport/com_separate_roll.vue b/src/views/modules/scheduleReport/com_separate_roll.vue index 189dfe9..bf78f65 100644 --- a/src/views/modules/scheduleReport/com_separate_roll.vue +++ b/src/views/modules/scheduleReport/com_separate_roll.vue @@ -6,6 +6,13 @@ + + + + + + + @@ -64,6 +71,7 @@ export default { username: this.$store.state.user.name, orderNo: '', itemNo: '', + rmRollNo: '', seqNo: '', rollNo: '', reportDate: '', @@ -195,10 +203,11 @@ export default { this.getSeqStandardRollQtyFun(); //清空参数 this.pageData.rollNums = 1; + this.pageData.rmRollNo = ''; this.visible = true; //获取焦点 this.$nextTick(() => { - this.$refs.rollQty.focus(); + this.$refs.rmRollNo.focus(); }); this.titleCon = this.labels.titleCon;//重置标题 }, @@ -246,8 +255,28 @@ export default { } }, + /*检查材料卷号的数据*/ + checkRmRollNo() { + //判断null和空字符串 + if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') { + this.$message.error('卷号不能为空!'); + return false; + } else { + //分拆site 和 卷号 + let siteAndRollNo = this.pageData.rmRollNo.trim().split(','); + //判断材料卷号是否合规 + if(siteAndRollNo.length != 2){ + this.$message.error('材料卷号非法!'); + return false; + } + this.pageData.rmRollNo = siteAndRollNo[1]; + } + this.pageData.rollNo = this.pageData.rmRollNo; + }, + //检查创建 createSeparateRollFun() { + let rmRollNo = this.pageData.rmRollNo; //获取当前是的数量 let rollQty = parseInt(this.pageData.rollQty); //判断是否可以修改 diff --git a/src/views/modules/scheduleReport/produce_order.vue b/src/views/modules/scheduleReport/produce_order.vue index bf8eb8a..bccb1b8 100644 --- a/src/views/modules/scheduleReport/produce_order.vue +++ b/src/views/modules/scheduleReport/produce_order.vue @@ -205,24 +205,6 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: '600001ProduceQtyReported', - tableId: '600001Produce', - tableName: '待生产工单', - columnProp: 'qtyReported', - headerAlign: 'center', - align: 'right', - columnLabel: '已报告数量', - columnWidth: 100, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, { userId: this.$store.state.user.name, functionId: functionId, @@ -259,78 +241,6 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: '600001ProduceRemark', - tableId: '600001Produce', - tableName: '待生产工单', - columnProp: 'remark', - headerAlign: 'center', - align: 'center', - columnLabel: '备注', - columnWidth: 180, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: '600001ProduceScheduledDate', - tableId: '600001Produce', - tableName: '待生产工单', - columnProp: 'scheduledDate', - headerAlign: 'center', - align: 'center', - columnLabel: '排产日期', - columnWidth: 120, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: '600001ProduceShiftNo', - tableId: '600001Produce', - tableName: '待生产工单', - columnProp: 'shiftNo', - headerAlign: 'center', - align: 'center', - columnLabel: '班次', - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: functionId, - serialNumber: '600001ProduceCustomerName', - tableId: '600001Produce', - tableName: '待生产工单', - columnProp: 'customerName', - headerAlign: 'center', - align: 'center', - columnLabel: '客户名称', - columnWidth: 180, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, ], reportButton: { dieCuttingButton: true,