From 97eab5f9a45a787004b60cd5eb32d79935c4a36b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 27 Aug 2024 11:05:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=87=AA=E6=A3=80?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=90=88=E6=A0=BC=E9=A1=B9=E2=80=9D?=
 =?UTF-8?q?=E5=B0=8F=E5=B4=A9=E8=BE=B9=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogb_check.vue | 96 +++++++++++++++++++++++++++++++-
 1 file changed, 93 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 2fca83e7..1daa9581 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -111,6 +111,18 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="小崩边">
+								<el-input-number
+									v-model="form.count_n_xbb"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+									@change="countChange"
+								/>
+							</el-form-item>
+						</el-col>
+						
 						<el-col :md="12" :sm="24">
 							<el-form-item label="麻点">
 								<el-input-number
@@ -144,6 +156,17 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<!-- <el-col :md="12" :sm="24">
+							<el-form-item label="棕圈">
+								<el-input-number
+									v-model="form.count_n_zq"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+									@change="countChange"
+								/>
+							</el-form-item>
+						</el-col> -->
 						<el-col :md="12" :sm="24">
 							<el-form-item label="其他">
 								<el-input-number
@@ -156,6 +179,49 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+					<!-- <el-row>
+						<el-col :span="24">
+							<el-form-item label="前道不良">
+								<el-button
+									type="primary"
+									icon="el-icon-plus"
+									@click="notok_add"
+								></el-button>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row style="margin-bottom:10px" v-for="(item, $index) in notokList" :key="item">
+						<el-col :span="10">
+							<el-select v-model="item.file" 
+							style="width:90%"
+								placeholder="请选择不合格项">
+								<el-option
+									v-for="notok in notokOptions"
+									:key="notok.value"
+									:label="notok.name"
+									:value="notok.value"
+								>
+								</el-option>
+							</el-select>
+						</el-col>
+						<el-col :span="12">
+							<el-input-number
+								style="width:90%"
+									v-model="item.value"
+									:min="0"
+									class="width-100"
+									controls-position="right"
+									@change="countChange"
+								/>
+						</el-col>
+						<el-col :span="2">
+							<el-button
+									type="danger"
+									icon="el-icon-delete"
+									@click="notok_del( $index)"
+								></el-button>
+						</el-col>
+					</el-row> -->
 				</el-form>
 			</el-main>
 			<el-footer>
@@ -184,12 +250,27 @@ export default {
 				count_n_qp: 0,
 				count_n_swen: 0,
 				count_n_bb: 0,
+				count_n_xbb:0,
 				count_n_md: 0,
 				count_n_xh: 0,
 				count_n_ps: 0,
 				count_n_qt: 0,
 				count_n_wm: 0,
+				count_n_zq:0
 			},
+			notokOptions:[
+				{name:"划伤",value:'count_n_hs'},
+				{name:"气泡",value:'count_n_qp'},
+				{name:"水纹",value:'count_n_swen'},
+				{name:"崩边",value:'count_n_bb'},
+				{name:"小崩边",value:'count_n_xbb'},
+				{name:"麻点",value:'count_n_md'},
+				{name:"划伤",value:'count_n_xh'},
+				{name:"破损",value:'count_n_ps'},
+				{name:"其他",value:'count_n_qt'},
+				{name:"雾面",value:'count_n_wm'},
+				{name:"棕圈",value:'count_n_zq'},
+			],
 			//验证规则
 			rules: {
 				batch: [
@@ -208,6 +289,7 @@ export default {
 				],
 			},
 			options: [],
+			notokList:[],
 			materialOptions: [],
 			visible: false,
 			isSaveing: false,
@@ -225,15 +307,23 @@ export default {
 			Object.assign(this.form, data);
 			console.log(this.form);
 		},
+		notok_add(){
+			this.notokList.push({file:'',value:0});
+		},
+		notok_del(index){
+			this.notokList.splice(index, 1)
+		},
 		countChange() {
 			this.form.count_notok =
 				this.form.count_n_hs +
 				this.form.count_n_qp +
 				this.form.count_n_swen +
 				this.form.count_n_bb +
+				this.form.count_n_xbb +
 				this.form.count_n_md +
 				this.form.count_n_xh +
 				this.form.count_n_ps +
+				this.form.count_n_zq +
 				this.form.count_n_qt +
 				this.form.count_n_wm;
 			this.form.count_ok = this.form.count_real - this.form.count_notok;
@@ -250,9 +340,11 @@ export default {
 						this.form.count_n_qp +
 						this.form.count_n_swen +
 						this.form.count_n_bb +
+						this.form.count_n_xbb +
 						this.form.count_n_md +
 						this.form.count_n_xh +
 						this.form.count_n_ps +
+						this.form.count_n_zq +
 						this.form.count_n_qt +
 						this.form.count_n_wm;
 					let sum = this.form.count_ok + this.form.count_notok;
@@ -269,9 +361,7 @@ export default {
 								that.isSaveing = false;
 							});
 					} else {
-						this.$message.error(
-							"使用数量与合格数不合格数数量不对等"
-						);
+						this.$message.error("使用数量与合格数不合格数数量不对等");
 					}
 				}
 			});