From 9b7670b94196bba9c71602c1567750ec9f91e003 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Jan 2024 09:09:56 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/produceReport/index.vue | 233 ++++++++++------------ 1 file changed, 106 insertions(+), 127 deletions(-) diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 901adef..67f259a 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -97,11 +97,11 @@ icon="el-icon-edit" @click="handleLook(scope.row)" v-hasPermi="['quality:qcIncomeReport:edit']" - >查看 + >查看报告 - + - - + + -
- + + - - - - - - - - - - - - - - + + 中山榄菊日化实业有限公司 - - - - + + 产品巡检记录表 - - - - - - - - - - - - - - - + + + 生成车间:{{printData.workCenter}} + 生成线体:{{printData.workCenter}} + 检查日期:{{printData.productDate}} + 产品名称:{{printData.printDate}} + 批次号:{{printData.printDate}} + 生产类型: + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + 检查人: + 品质主管: + - - - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- +
- 确 定 取 消
@@ -244,7 +202,7 @@ - - + - + - + @@ -322,7 +280,7 @@ - + @@ -356,7 +314,7 @@ - +
确 定
@@ -388,7 +346,10 @@ export default { total: 0, //打印 formRef: 'form', + newWorkerLoading: false, + refreshNewWorkerTable:true, validateRules: [], + checkList: [], printData: { printable: 'printFrom', ignore: ['no-print'], @@ -457,6 +418,10 @@ export default { this.getCheckTypes(); }, methods: { + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, /****/ getCheckTypes() { getCheckTypes('material').then(response => { @@ -530,7 +495,7 @@ export default { updateTime: null, factoryCode: null, delFlag: null, - + }; this.resetForm("form"); }, @@ -560,25 +525,35 @@ export default { handleLook(row) { this.reset(); const recordId = row.recordId || this.ids - this.queryParams.recordId = recordId; - getProduce(recordId).then(response => { - this.form = response.data; - if(this.form.checkType =='checkTypeSC') { + + if(row.checkType =='checkTypeSC') { + getProduce(recordId).then(response => { + this.form = response.data; //首检报告 this.form.printable = 'firstReportPrint'; //打印时需要 this.form.ignore = ['no-print'];//打印时需要 this.firstReportOpen = true; this.title = "首检检验报告"; - }else { - //巡检报告 - this.form.printable = 'printForm'; //打印时需要 + }) + this.queryParams.recordId = recordId; + this.getCheckedProjectList(); + }else { + //巡检报告 + this.form.printable = 'printForm'; //打印时需要 + this.form.ignore = ['no-print'];//打印时需要 + this.open = true; + this.title = "巡检检验报告"; + const orderNo = row.orderNo; + getProduceXJ(orderNo).then(response => { + this.form = response.data; + //首检报告 + this.form.printable = 'firstReportPrint'; //打印时需要 this.form.ignore = ['no-print'];//打印时需要 - this.open = true; - this.title = "巡检检验报告"; - } - - }); - this.getCheckedProjectList(); + this.firstReportOpen = true; + this.title = "首检检验报告"; + }) + } + }, /** 提交按钮 */ submitForm() { @@ -652,7 +627,7 @@ export default { margin-bottom: 15px; margin-left: 10px; } -.center-text { +.center-text { text-align: center; } .report-logo { @@ -660,4 +635,8 @@ export default { margin-left: 15px; height: 38px; } - \ No newline at end of file +.my-print-nav { + margin-top: 15px; + margin-bottom: 15px; +} + From 9adeb55c988a1bbc14e3ced726711745109babc4 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Jan 2024 09:51:12 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=8A=BD=E6=A0=B7?= =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/firstReport.js | 93 ---- src/api/quality/qcSampleRule.js | 8 + src/views/quality/firstReport/index.vue | 516 ----------------------- src/views/quality/qcSampleRule/index.vue | 94 +++-- 4 files changed, 57 insertions(+), 654 deletions(-) delete mode 100644 src/api/quality/firstReport.js delete mode 100644 src/views/quality/firstReport/index.vue diff --git a/src/api/quality/firstReport.js b/src/api/quality/firstReport.js deleted file mode 100644 index 03e3db1..0000000 --- a/src/api/quality/firstReport.js +++ /dev/null @@ -1,93 +0,0 @@ -import request from '@/utils/request' - -// 查询来料报告列表 -export function listIncome(query) { - return request({ - url: '/quality/qcFirstReport/list', - method: 'get', - params: query - }); -} - -// 查询来料报告详细 -export function getIncome(recordId) { - return request({ - url: '/quality/qcFirstReport/' + recordId, - method: 'get' - }); -} - -// 新增来料报告 -export function addIncome(data) { - return request({ - url: '/quality/qcFirstReport', - method: 'post', - data: data - }); -} - -// 修改来料报告 -export function updateIncome(data) { - return request({ - url: '/quality/qcFirstReport', - method: 'put', - data: data - }); -} - -// 删除来料报告 -export function delIncome(recordId) { - return request({ - url: '/quality/qcFirstReport/' + recordId, - method: 'delete' - }); -} - -// 查询BOM物料管理列表 -export function getQcListBom(query) { - return request({ - url: '/quality/qcFirstReport/getQcListBom', - method: 'get', - params: query - }); - } - -// 查询供应商管理列表 -export function getQcListSupplier(query) { - return request({ - url: '/quality/qcFirstReport/getQcListSupplier', - method: 'get', - params: query - }); - } - -// 查询人员列表 -export function getQcListUser(query) { - return request({ - url: '/quality/qcFirstReport/getQcListUser', - method: 'get', - params: query - }); - } - -//状态修改 -export function changeIncomeStatus(recordId, status) { - const data = { - recordId, - status - } - return request({ - url: '/quality/qcFirstReport/changeIncomeStatus', - method: 'put', - data: data - }) - } - -// 查询检测项列表 -export function getCkeckProjectList(query) { - return request({ - url: '/quality/qcFirstReport/getCkeckProjectList', - method: 'get', - params: query - }); - } diff --git a/src/api/quality/qcSampleRule.js b/src/api/quality/qcSampleRule.js index 89782bd..8c0c9f0 100644 --- a/src/api/quality/qcSampleRule.js +++ b/src/api/quality/qcSampleRule.js @@ -42,3 +42,11 @@ export function delQcSampleRule(id) { method: 'delete' }); } + +// 根据大节点获取检验节点类型 +export function getCheckType(typeCode) { + return request({ + url: '/quality/qcSampleRule/getCheckType/' + typeCode, + method: 'get', + }) +} diff --git a/src/views/quality/firstReport/index.vue b/src/views/quality/firstReport/index.vue deleted file mode 100644 index 68341b2..0000000 --- a/src/views/quality/firstReport/index.vue +++ /dev/null @@ -1,516 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/quality/qcSampleRule/index.vue b/src/views/quality/qcSampleRule/index.vue index 9274ed0..f6c71fe 100644 --- a/src/views/quality/qcSampleRule/index.vue +++ b/src/views/quality/qcSampleRule/index.vue @@ -1,6 +1,6 @@ From f3f49d6a6d30bb57031cf47de308579b770b059f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 9 Jan 2024 09:51:39 +0800 Subject: [PATCH 03/10] =?UTF-8?q?2024-1-9-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E8=AE=BE=E5=A4=87-=E5=B1=95=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 7 +++++++ src/views/wms/equipment/itemEquipment.vue | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d9997b5..19ee090 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -221,6 +221,13 @@ /> + + @@ -27,6 +28,7 @@ - diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue index dba26fb..00c7e02 100644 --- a/src/views/mes/unitprice/index.vue +++ b/src/views/mes/unitprice/index.vue @@ -106,9 +106,9 @@ - +