From 53509ed75a4caa422ed8f1de0060478d7c7a58ef Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Fri, 22 Apr 2022 10:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=88=86=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_separate_roll_with_split.vue | 60 +++++++++++++++- .../yieldReport/com_split_order_report.vue | 70 +++++++++++++++++++ 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/src/views/modules/yieldReport/com_separate_roll_with_split.vue b/src/views/modules/yieldReport/com_separate_roll_with_split.vue index 1d69b57..0ec41ab 100644 --- a/src/views/modules/yieldReport/com_separate_roll_with_split.vue +++ b/src/views/modules/yieldReport/com_separate_roll_with_split.vue @@ -289,6 +289,24 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialPartNo', + tableId: "5305Material", + tableName: "材料", + columnProp: "partNo", + headerAlign: "center", + align: "center", + columnLabel: "物料编码", + columnWidth: 80, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5305, @@ -325,6 +343,42 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialPartDesc', + tableId: "5305Material", + tableName: "材料", + columnProp: "partDesc", + headerAlign: "center", + align: "center", + columnLabel: "物料描述", + columnWidth: 180, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialOriRollNo', + tableId: "5305Material", + tableName: "材料", + columnProp: "oriRollNo", + headerAlign: "center", + align: "center", + columnLabel: "原卷号", + columnWidth: 120, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5305, @@ -439,6 +493,8 @@ export default { /*关闭modal*/ closeDialog () { this.$emit('update:visible', false) + //刷新报工的页面 + this.$emit('refreshPageData') }, /*刷新分期工单的*/ @@ -561,8 +617,8 @@ export default { this.$message.error(data.msg) } else { this.$message.success(data.msg) - //刷新报工的页面 - this.$emit('refreshPageData') + //刷新报工的table表格 + this.getCurrentPageTable(); //清空参数 this.pageData.customerId = '无'; this.pageData.customerName = ''; diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue index aba0ed5..e4117fc 100644 --- a/src/views/modules/yieldReport/com_split_order_report.vue +++ b/src/views/modules/yieldReport/com_split_order_report.vue @@ -2541,6 +2541,24 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialPartNo', + tableId: "5305Material", + tableName: "材料", + columnProp: "partNo", + headerAlign: "center", + align: "center", + columnLabel: "物料编码", + columnWidth: 80, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5305, @@ -2577,6 +2595,42 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialPartDesc', + tableId: "5305Material", + tableName: "材料", + columnProp: "partDesc", + headerAlign: "center", + align: "center", + columnLabel: "物料描述", + columnWidth: 180, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, + { + userId: this.$store.state.user.name, + functionId: 5305, + serialNumber: '5305MaterialOriRollNo', + tableId: "5305Material", + tableName: "材料", + columnProp: "oriRollNo", + headerAlign: "center", + align: "center", + columnLabel: "原卷号", + columnWidth: 120, + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5305, @@ -2893,42 +2947,56 @@ export default { }, //刷新派工单的时间的记录 async getSfdcTimeList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; await getSfdcTimeByCon(this.searchData).then(({data}) => { this.sfdcTimeList = data.rows; }); }, //刷新工单的工具信息 getOrderToolList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getOrderToolByCon(this.searchData).then(({data}) => { this.orderToolList = data.rows; }); }, //刷新派工单的刀模板的记录 getSfdcToolList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getSfdcToolByCon(this.searchData).then(({data}) => { this.sfdcToolList = data.rows; }); }, //刷新工单的bom信息 getOrderBomList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getOrderBomByCon(this.searchData).then(({data}) => { this.orderBomList = data.rows; }); }, //刷新派工单的材料表的记录 getSfdcMaterialList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getSfdcMaterialByCon(this.searchData).then(({data}) => { this.sfdcMaterialList = data.rows; }); }, //刷新派工单的下机卷的记录 getSfdcRollOpsList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getSfdcRollOpsByCon(this.searchData).then(({data}) => { this.sfdcRollOpsList = data.rows; }); }, //刷新派工单的不良标的记录 getSfdcDefectList() { + //重置查询的工序 + this.searchData.itemNo = this.scheduleData.itemNo; getSfdcDefectByCon(this.searchData).then(({data}) => { this.sfdcDefectList = data.rows; }); @@ -2936,6 +3004,8 @@ export default { //刷新派工单的下机卷的记录 getSfdcRollList() { + //不按工序查询 + this.searchData.itemNo = -1; refreshSplitScheduleTable(this.searchData).then(({data}) => { this.materialRollList = data.rows; });