From ddef778a447e99e3b9450443404563011bd2688c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 6 Jun 2024 10:37:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/aql.js | 44 +++ src/api/quality/code.js | 44 +++ src/layout/components/Navbar.vue | 2 + src/views/mes/reportWork/index.vue | 4 +- src/views/quality/aql/codeContent.vue | 265 +++++++++++++ src/views/quality/aql/index.vue | 440 ++++++++++++++++++++++ src/views/quality/produceReport/index.vue | 26 +- 7 files changed, 798 insertions(+), 27 deletions(-) create mode 100644 src/api/quality/aql.js create mode 100644 src/api/quality/code.js create mode 100644 src/views/quality/aql/codeContent.vue create mode 100644 src/views/quality/aql/index.vue diff --git a/src/api/quality/aql.js b/src/api/quality/aql.js new file mode 100644 index 00000000..722f2a43 --- /dev/null +++ b/src/api/quality/aql.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询抽样规则-接收质量限列表 +export function listAql(query) { + return request({ + url: '/quality/aql/list', + method: 'get', + params: query + }); +} + +// 查询抽样规则-接收质量限详细 +export function getAql(id) { + return request({ + url: '/quality/aql/' + id, + method: 'get' + }); +} + +// 新增抽样规则-接收质量限 +export function addAql(data) { + return request({ + url: '/quality/aql', + method: 'post', + data: data + }); +} + +// 修改抽样规则-接收质量限 +export function updateAql(data) { + return request({ + url: '/quality/aql', + method: 'put', + data: data + }); +} + +// 删除抽样规则-接收质量限 +export function delAql(id) { + return request({ + url: '/quality/aql/' + id, + method: 'delete' + }); +} diff --git a/src/api/quality/code.js b/src/api/quality/code.js new file mode 100644 index 00000000..bdef6f23 --- /dev/null +++ b/src/api/quality/code.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询抽样规则-样品量字码列表 +export function listCode(query) { + return request({ + url: '/quality/code/list', + method: 'get', + params: query + }); +} + +// 查询抽样规则-样品量字码详细 +export function getCode(id) { + return request({ + url: '/quality/code/' + id, + method: 'get' + }); +} + +// 新增抽样规则-样品量字码 +export function addCode(data) { + return request({ + url: '/quality/code', + method: 'post', + data: data + }); +} + +// 修改抽样规则-样品量字码 +export function updateCode(data) { + return request({ + url: '/quality/code', + method: 'put', + data: data + }); +} + +// 删除抽样规则-样品量字码 +export function delCode(id) { + return request({ + url: '/quality/code/' + id, + method: 'delete' + }); +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7b44fded..a4381608 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,12 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); + /** //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); + **/ }, components: { Breadcrumb, diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 801e9612..15858ccd 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -385,7 +385,7 @@ - + - --> +
diff --git a/src/views/quality/aql/codeContent.vue b/src/views/quality/aql/codeContent.vue new file mode 100644 index 00000000..b5151741 --- /dev/null +++ b/src/views/quality/aql/codeContent.vue @@ -0,0 +1,265 @@ + + + diff --git a/src/views/quality/aql/index.vue b/src/views/quality/aql/index.vue new file mode 100644 index 00000000..8d279584 --- /dev/null +++ b/src/views/quality/aql/index.vue @@ -0,0 +1,440 @@ + + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index abe68092..7a28404a 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -1066,30 +1066,7 @@ export default { }); }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { - console.log("rowIndex", rowIndex); - // 准备在第二列进行合并操作 - // if (columnIndex == 1) { - // // 从第0行进行合并 - // if (rowIndex == 0) { - // return { - // rowspan: 3, // 合并3行 - // colspan: 1, // 合并1列（当前列） - // }; - // } - // if (rowIndex == 3) { - // return { - // rowspan: 2, // 合并2行 - // colspan: 1, // 合并1列 - // }; - // } - // if (rowIndex == 5) { - // return { - // rowspan: 2, // 合并1行 - // colspan: 1, // 合并1列 - // }; - // } - // } - /** + /** if (columnIndex === 0) { const _row = this.spanArr[rowIndex]; const _col = _row > 0 ? 1 : 0; @@ -1107,7 +1084,6 @@ export default { colspan: _col, }; } - }, } }; From ad3f05b69bd0bf9f65b443fbf5014497887ba7fe Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 6 Jun 2024 10:38:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=94=B9=E7=89=880?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a4381608..947108ca 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - /** + //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - **/ + }, components: { Breadcrumb, From 96abce45a8d3394a7f5226db373ff13ceba29bc0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 6 Jun 2024 11:24:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/outorder/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue index 18230c63..f489f036 100644 --- a/src/views/wms/outorder/index.vue +++ b/src/views/wms/outorder/index.vue @@ -425,6 +425,7 @@ export default { selectedRows: [], stationNo: '', addoutorderList: [], + produceCodeTEM: '', }; }, created() { @@ -454,6 +455,7 @@ export default { this.loading = true; PurchaseOrderOutboundPda(this.queryParams1).then(response => {//000100220987 this.addoutorderList = response.data.list; + this.produceCodeTEM=response.data.produceCode; console.log(this.addoutorderList) // this.total = response.total; // this.loading = false; @@ -635,7 +637,8 @@ export default { // this.getList(); // }); } else { - this.queryParams2.orderNo = this.queryParams1.produceCode + //this.queryParams2.orderNo = this.queryParams1.produceCode + this.queryParams2.orderNo = this.produceCodeTEM this.queryParams2.warehouseNo = this.queryParams1.warehouseNo this.queryParams2.list = _this.selectedRows this.queryParams2.ken = 2