diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue index a5bb6c1..823e6b7 100644 --- a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue +++ b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue @@ -10,7 +10,8 @@ 打印 - 完成布产 + 取消完成布产 + 完成布产 改模 @@ -919,6 +920,38 @@ export default { }, + pageUnComplete() { + let dataId = this.getDataId(); + if (!dataId) { + return; + } + + + let sendComplete = () => { + this.$mk.post({ + url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/cancelComplete`, + loading: '操作中...', + data: { + id: this.getDataId_BigInt() + }, + useBigInt: true + }).then(a => { + if (a.code == "200") { + this.$mk.success("操作成功"); + this.pageInit(); + } + else { + this.$mk.error(a.msg); + } + }); + } + this.$mk.confirm('您确定要取消完成布产吗？').then(type => { + if (type == 'confirm') { + sendComplete(""); + } + }); + + }, pageApproved() { let dataId = this.getDataId(); if (!dataId) { diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue index f31c6b2..495e559 100644 --- a/src/pages/Middle/Mold/Touch/Reporting.vue +++ b/src/pages/Middle/Mold/Touch/Reporting.vue @@ -12,42 +12,99 @@

工艺布产工序

+
+
+
+
-
-
-
+
部门：{{ item.department_detail ? item.department_detail.name : '' }}
+
部件：{{ item.component_detail ? item.component_detail.name : '' }}
+
工序：{{ item.process_detail ? item.process_detail.name : '' }}
-
部门：{{ item.department_detail ? item.department_detail.name : '' }}
-
部件：{{ item.component_detail ? item.component_detail.name : '' }}
-
工序：{{ item.process_detail ? item.process_detail.name : '' }}
- -
状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}
-
-
-
- 发料 - 撤销发料 - - 报工 - - 撤销报工 +
状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}
-
- {{ getDateValueString(item.complete_time) }} +
+
+ 发料 + 撤销发料 + + 报工 + + 撤销报工 +
+
+ {{ getDateValueString(item.complete_time) }} +
+ +
+
+ +
+ + + + + +
+
+ +
+
+ +
+ +

【部门】{{ ditem.name }}

+ +
+ +
+
+ + +
部件：{{ item.component_detail ? item.component_detail.name : '' }}
+
工序：{{ item.process_detail ? item.process_detail.name : '' }}
+ +
状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}
+
+
+
+ 发料 + 撤销发料 + + 报工 + + 撤销报工 +
+
+ {{ getDateValueString(item.complete_time) }} +
+ +
+
+ +
+ + + + +
-
-
- - - +
+ +
@@ -56,10 +113,20 @@

部门进度汇总

- + + + + @@ -92,7 +159,8 @@ - + @@ -101,7 +169,8 @@ title="模具" width="130"> @@ -175,6 +244,32 @@ export default { actions: { }, + sub_columns: [ + + { + title: '工序名', + dataIndex: 'process_detail_name', + key: 'process_detail_name', + }, + { + title: '工序编号', + dataIndex: 'process_detail_code', + key: 'process_detail_code', + }, + { + title: '部件名', + dataIndex: 'component_detail_name', + key: 'component_detail_name', + }, + + { + title: '进度', + dataIndex: 'progress', + key: 'progress', + slots: { title: 'progress' }, + scopedSlots: { customRender: 'progress' }, + }, + ], tabKey: '2', keyName: 'id', // 是否编辑模式 @@ -383,12 +478,12 @@ export default { } }, loadPoData() { - + this.$mk.post({ url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/order/list`, loading: "搜索中...", - data: { + data: { "ptyid": 0, "company_id": parseInt(process.env.VUE_APP_COMPANY_ID), "search_rules": [ @@ -396,7 +491,7 @@ export default { "end_time": 0, "company_token": process.env.VUE_APP_COMPANYTOKEN, "store_id": 0, - "order_bys": [{"column":"complete_time","order":"asc"}], + "order_bys": [{ "column": "complete_time", "order": "asc" }], "limit": 0, "project_token": process.env.VUE_APP_APPTOKEN, "beid": parseInt(process.env.VUE_APP_BEID), @@ -404,9 +499,9 @@ export default { "start_time": 0 }, useBigInt: true, - }).then(a => { - this.poData = JSON.parse(JSON.stringify(a.data.MoldProductionOrder)); - console.log(this.poData) + }).then(a => { + this.poData = JSON.parse(JSON.stringify(a.data.MoldProductionOrder)); + console.log(this.poData) }); }, selectPoInfo(row) { @@ -633,7 +728,7 @@ export default { loadProductionOrder({ id, resetProcesses }) { this.currentId = id; - this.tabKey = '1'; + this.tabKey = '1'; this.loading = true this.$mk.get({ @@ -647,10 +742,26 @@ export default { let data3 = Object.assign({}, row.mold_detail); - this.detailsData3 = JSON.parse(JSON.stringify(row.department_progress || [])); + let mold_production_order_component_processes = JSON.parse(JSON.stringify(row.mold_production_order_component_processes)); + let ds3 = JSON.parse(JSON.stringify(row.department_progress || [])); + + + ds3.forEach(item => { + item.progressList = []; + mold_production_order_component_processes.forEach(pitem => { + if (pitem.department_id == item.id) { + pitem.process_detail_name = pitem.process_detail.name + pitem.process_detail_code = pitem.process_detail.code + pitem.component_detail_name = pitem.component_detail.name + + item.progressList.push(pitem); + } + }) + }) + + this.detailsData3 = ds3; - console.log(this.detailsData3) data3.mold_master_user_detail = row.mold_master_user_detail; @@ -810,15 +921,16 @@ export default { padding: 30px; background: #f4f4f4; } -.page-body-touch{ + +.page-body-touch { font-size: 22px; } -.page-body-touch -.vxe-form{ + +.page-body-touch .vxe-form { font-size: 22px; } -.page-body-touch -.vxe-table--render-default{ + +.page-body-touch .vxe-table--render-default { font-size: 22px; }