From 4d8bf81be399d3aa8781a5070e4fdc1f0470bcc5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 21 Nov 2024 13:27:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98=E6=94=BE=E5=BC=80=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/check_form.vue | 256 +++++++++++++++++++++++++++++++-
 src/views/wpm_gx/inm.vue        |  12 +-
 2 files changed, 263 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue
index fc3a507d..27426bf1 100644
--- a/src/views/wpm_gx/check_form.vue
+++ b/src/views/wpm_gx/check_form.vue
@@ -135,7 +135,257 @@
 						</el-col>
 					</el-row>
 					<el-divider style="margin-top:0"></el-divider>
-					<el-row>
+					<!-- 尺寸检验 -->
+					<el-row v-if="mgroupName=='size'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="黑圈内径">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hqnj"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="黑圈内径圆度">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hqnjyd"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="黑圈外径">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hqwj"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="黑圈外径圆度">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hqwjyd"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="产品外径">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_wj"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="产品圆度">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_yd"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="产品同心度">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_txd"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="厚度">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hd"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="准合格">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_zhg"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="圆准">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_yz"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- 外观检验 -->
+					<el-row  v-else-if="mgroupName=='facade'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="脏">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_z"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="气泡">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_qp"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="水纹">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_swen"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="崩边">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_bb"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="棕边">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_zb"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="棕圈">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_zq"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="划伤">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hs"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="麻点">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_md"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="黑圈变形">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_hqbx"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="倒角">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_dj"
+									style="width: 100%"
+									precision="0"
+									
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="破损">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_ps"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="蓝圈">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_lq"
+									style="width: 100%"
+									precision="0"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- 过程检验 -->
+					<el-row v-else>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="厚度">
 								<el-input-number
@@ -288,6 +538,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		mgroupName:{
+			type: String,
+			default: "",
+		},
 		itemObj:{
 			type: Object,
 			default: null,
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index eac2ace2..a2a502b7 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -107,7 +107,6 @@
 					fixed="right"
 					align="center"
 					width="120"
-					
 				>
 					<template #default="scope">
 						<el-button
@@ -115,14 +114,15 @@
 							@click="table_Check(scope.row)"
 							v-auth="'ftestwork.create'"
 							type="primary"
-							v-if="mgroupName!=='size'&&mgroupName!=='facade'&&scope.row.notok_sign_name == null"
+							v-if="scope.row.notok_sign_name == null"
 							>检验
 						</el-button>
+						<!-- v-if="mgroupName!=='size'&&mgroupName!=='facade'&&scope.row.notok_sign_name == null" -->
 						<el-button
 							link size="small"
 							type="warning"
 							@click="tableCheckList(scope.row)"
-							v-if="mgroupName!=='size'&&mgroupName!=='facade'&&scope.row.notok_sign_name == null"
+							v-if="scope.row.notok_sign_name == null"
 							>检验记录
 						</el-button>
 						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
@@ -142,6 +142,7 @@
 			v-if="dialog.save"
 			ref="saveDialog"
 			:mgroup="mgroupId"
+			:mgroupName="mgroupName"
 			:itemObj = "checkItem"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
@@ -251,10 +252,12 @@ export default {
 	},
 	mounted() {
 		let that = this;
+		console.log(that.mgroupName);
 		if(that.mgroupName=="size"){
 			// that.params.material__process__name = "一次超洗";
 			that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
 				if(res.length>0){
+					that.params.mgroupx = null;
 					that.params.belong_dept=res[0].id;
 				}
 				that.apiObj = that.$API.wpm.wmaterial.list;
@@ -263,6 +266,7 @@ export default {
 			// that.params.material__process__name = "二次超洗";
 			that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
 				if(res.length>0){
+					that.params.mgroupx = null;
 					that.params.belong_dept=res[0].id;
 				}
 				that.apiObj = that.$API.wpm.wmaterial.list;
@@ -279,7 +283,7 @@ export default {
 				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
 				that.process = res[0].process;
 				that.params.mgroupx = res[0].id;
-				that.params.belong_dept = res[0].belong_dept;
+				// that.params.belong_dept = res[0].belong_dept;
 				that.apiObj = that.$API.wpm.wmaterial.list;
 			});
 		}