From 3cb23bc4d18c4b3bf604b593385658e94e6241f2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 8 May 2024 17:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E6=8A=A5?= =?UTF-8?q?=E5=91=8A+=E6=A0=87=E5=87=86=E4=BA=A7=E8=83=BD(=E6=97=B6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/productReport/index.vue | 236 ++++++++++++---------- src/views/quality/qcWarehousing/index.vue | 3 - src/views/wms/equipment/index.vue | 10 +- 3 files changed, 130 insertions(+), 119 deletions(-) diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 5d0b65f..679dcfe 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -138,134 +138,106 @@

成品检验报告

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {{form.materialName}} + {{form.quality}} + {{form.checkNo}} + + {{form.materialCode}} + {{form.checkLoc}} + {{form.createTime}} + + {{form.incomeBatchNo}} + {{form.standardNo}} + {{form.checkTime}} + + + + 包装检验项目 + + + + + + + + + + + + + + + - - - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - - - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - - - - - - - - - - + + + 内容物分析项目 + - - + - - - - - - - - - - - - - - + + + + + + - - - - - 合格 - - - 不合格 - - - - + + + + + + 合格 + 不合格 + + + + 判定合格打“√”，不合格打“×” + + + + + + + - + - + - - - + + + {{form.checkManName}} @@ -358,13 +330,27 @@ export default { factoryCode: null, }, // 表单参数 - form: {}, + form: {checkedValues:[]}, checkTypes:[], // 表单校验 rules: { /* incomeBatchNo: [ { required: true, message: "来料批次号不能为空", trigger: "blur" } ], */ + }, + content_style: { + 'text-align': 'center', + 'min-width': '200px', + 'word-break': 'break-all' + }, + label_style: { + 'color': '#000', + 'text-align': 'center', + 'font-weight': '600', + 'height': '40px', + 'background-color': '#d6dbe1', + 'min-width': '100px', + 'word-break': 'keep-all' } }; }, @@ -481,6 +467,9 @@ export default { this.queryParams.recordId = recordId; getProduct(recordId).then(response => { this.form = response.data; + let checkedValues0 =[]; + checkedValues0.push(response.data.checkResult) + this.form.checkedValues = ['Y']; this.form.printable = 'printFrom'; //打印时需要 this.form.ignore = ['no-print'];//打印时需要 this.open = true; @@ -529,7 +518,18 @@ export default { getCheckedProjectList(){ this.loading = true; getCkeckProjectList(this.queryParams).then((response) => { - this.checkProjectList = response.rows; + const itemType1s=[]; + const itemType0s=[]; + response.rows.forEach(item=>{ + if (item.itemType == '1') { + itemType1s.push(item); + }else if(item.itemType == '0'){ + itemType0s.push(item); + } + }) + + this.checkProjectList = itemType1s; + this.checkProjectList0 = itemType0s; this.total = response.total; this.loading = false; this.form.standardNo = this.checkProjectList[0].standardNo; @@ -576,4 +576,18 @@ export default { margin-left: 15px; height: 38px; } +.my-description-item1 { + width: 280px; /* 或者你想要的任何宽度 */ +} +.my-description-item2 { + width: 120px; /* 或者你想要的任何宽度 */ +} +.my-description-item3 { + width: 80px; /* 或者你想要的任何宽度 */ +} +.border-row { + border: 1px solid #d3dce6; /* 边框颜色可以根据需要自定义 */ + text-align:center; +} + \ No newline at end of file diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index cf5dbb9..dd8ab06 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -458,9 +458,6 @@ export default { form: {}, // 表单校验 rules: { - incomeBatchNo: [ - { required: true, message: "批次号不能为空", trigger: "blur" } - ], orderNo: [ { required: true, message: "订单号不能为空", trigger: "blur" } ], diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index dd799af..dce9e9a 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -189,7 +189,7 @@ label="设备编码" align="center" prop="equipmentCode" - width="150" + width="100" fixed="left" >