From 7ce9f1d9f671f11c29f67e8ebfc73abd8f88071d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 18 Dec 2023 14:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=9F=B3=E6=B0=94=E7=BA=BF=E5=88=86?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_10dept.vue   |  3 +-
 src/views/bigScreen/index_7dept.vue    |  3 +-
 src/views/bigScreen/index_photon.vue   |  3 +-
 src/views/bigScreen/textIndex.vue      |  3 +-
 src/views/inm/mioitem.vue              | 13 +++---
 src/views/inm/mioitem_check.vue        | 14 +++++--
 src/views/statistics/inm_check.vue     |  4 +-
 src/views/statistics/product_check.vue | 14 +++++--
 src/views/wpm/mlog6_form.vue           | 27 +++++++++---
 src/views/wpm/mlog_dept10.vue          |  4 +-
 src/views/wpm/mlog_dept6_detail.vue    |  3 +-
 src/views/wpm/mlog_drawer.vue          |  9 +++-
 src/views/wpm/worktask.vue             |  4 +-
 src/views/wpm/worktask_form.vue        | 58 +++++++++++++++++++++-----
 14 files changed, 122 insertions(+), 40 deletions(-)

diff --git a/src/views/bigScreen/index_10dept.vue b/src/views/bigScreen/index_10dept.vue
index 4c20d5b9..7a1f4cd8 100644
--- a/src/views/bigScreen/index_10dept.vue
+++ b/src/views/bigScreen/index_10dept.vue
@@ -456,7 +456,8 @@ export default {
                     { value: 1, name: '椭圆弯曲' },
                     { value: 3, name: '大小头' },
                     { value: 0, name: '偏壁' },
-                    { value: 5, name: '结石气线' },
+                    { value: 5, name: '结石' },
+                    { value: 5, name: '气线' },
                     { value: 200, name: '合格' },
                 ],
                 emphasis: {
diff --git a/src/views/bigScreen/index_7dept.vue b/src/views/bigScreen/index_7dept.vue
index 9c56596c..8655e37f 100644
--- a/src/views/bigScreen/index_7dept.vue
+++ b/src/views/bigScreen/index_7dept.vue
@@ -340,7 +340,8 @@ export default {
                     { value: 1, name: '椭圆弯曲' },
                     { value: 3, name: '大小头' },
                     { value: 0, name: '偏壁' },
-                    { value: 5, name: '结石气线' },
+                    { value: 5, name: '结石' },
+                    { value: 5, name: '气线' },
                     { value: 200, name: '合格' },
                 ],
                 emphasis: {
diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index bb4585cc..e125ab39 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -1313,7 +1313,8 @@ export default {
                             { value: 8, name: '椭圆弯曲' },
                             { value: 0, name: '大小头' },
                             { value: 2, name: '偏壁' },
-                            { value: 6, name: '结石气线' },
+                            { value: 6, name: '结石' },
+                            { value: 6, name: '气线' },
 
 
                         ]
diff --git a/src/views/bigScreen/textIndex.vue b/src/views/bigScreen/textIndex.vue
index c90c6c11..40a9b41d 100644
--- a/src/views/bigScreen/textIndex.vue
+++ b/src/views/bigScreen/textIndex.vue
@@ -1250,7 +1250,8 @@ export default {
                             { value: 8, name: '椭圆弯曲' },
                             { value: 0, name: '大小头' },
                             { value: 2, name: '偏壁' },
-                            { value: 6, name: '结石气线' },
+                            { value: 6, name: '结石' },
+                            { value: 6, name: '气线' },
                             
                             
                         ]
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 33f5ea80..a7bb6e7e 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -44,13 +44,14 @@
                     </el-table-column>
                     <el-table-column label="操作" fixed="right" align="center" width="100px">
                         <template #default="scope">
-                            <el-link type="primary" @click="table_check(scope.row)" v-if="mioObj.state==20&&mioObj.type=='do_in'">
+                            <!-- <el-link type="primary" @click="table_check(scope.row)" v-if="mioObj.state==20&&mioObj.type=='do_in'"> -->
+                            <el-link type="primary" @click="table_check(scope.row)" v-if="scope.row.test_date==null">
                                 检验
                             </el-link>
-                            <!-- <el-link type="primary" @click="table_Show(scope.row)" v-else>
+                            <el-link type="primary" @click="check_Show(scope.row)" v-else>
                                 查看
-                            </el-link> -->
-                            <el-link type="danger" @click="table_del(scope.row)" v-if="mioObj.state == 10">
+                            </el-link>
+                            <el-link type="danger" @click="table_del(scope.row)" v-if="scope.row.test_date==null">
                                 删除
                             </el-link>
                         </template>
@@ -161,11 +162,11 @@ export default {
                 this.$refs.checkDialog.open("add");
             });
         },
-        table_Show(row){
+        check_Show(row){
             this.dialog.check = true;
             this.mioitemId = row.id;
             this.$nextTick(() => {
-                this.$refs.checkDialog.open("add");
+                this.$refs.checkDialog.open("show").setData(row);
             });
         },
         //本地更新数据
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index 13702622..630c5788 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="过程检验"
+    title="检验"
     v-model="visible"
     :size="1000"
     destroy-on-close
@@ -91,8 +91,14 @@
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
-              <el-form-item label="结石气线">
-                <el-input-number v-model="form.count_n_jsqx" :min="0" style="width:100%" controls-position="right">
+              <el-form-item label="结石">
+                <el-input-number v-model="form.count_n_js" :min="0" style="width:100%" controls-position="right">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="气线">
+                <el-input-number v-model="form.count_n_qx" :min="0" style="width:100%" controls-position="right">
                 </el-input-number>
               </el-form-item>
             </el-col>
@@ -105,7 +111,7 @@
           </el-row>
         </el-form>
       </el-main>
-      <el-footer>
+      <el-footer v-if="mode=='add'">
         <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
         <el-button @click="visible = false">取消</el-button>
       </el-footer>
diff --git a/src/views/statistics/inm_check.vue b/src/views/statistics/inm_check.vue
index 9678be35..68818b64 100644
--- a/src/views/statistics/inm_check.vue
+++ b/src/views/statistics/inm_check.vue
@@ -100,7 +100,9 @@
 									</el-table-column>
 									<el-table-column label="大小头" prop="count_n_dxt">
 									</el-table-column>
-									<el-table-column label="结石气绒" prop="count_n_jsqx">
+									<el-table-column label="结石" prop="count_n_js">
+									</el-table-column>
+									<el-table-column label="气线" prop="count_n_qx">
 									</el-table-column>
 									<el-table-column label="合计" prop="count_n_qt">
 									</el-table-column>
diff --git a/src/views/statistics/product_check.vue b/src/views/statistics/product_check.vue
index 958bd965..c7c64984 100644
--- a/src/views/statistics/product_check.vue
+++ b/src/views/statistics/product_check.vue
@@ -91,7 +91,9 @@
 								</el-table-column>
 								<el-table-column label="大小头" prop="count_n_dxt">
 								</el-table-column>
-								<el-table-column label="结石气绒" prop="count_n_jsqx">
+								<el-table-column label="结石" prop="count_n_js">
+								</el-table-column>
+								<el-table-column label="气线" prop="count_n_qx">
 								</el-table-column>
 								<el-table-column label="合计" prop="count_n_qt">
 								</el-table-column>
@@ -126,7 +128,9 @@
 								</el-table-column>
 								<el-table-column label="大小头" prop="count_n_dxt">
 								</el-table-column>
-								<el-table-column label="结石气绒" prop="count_n_jsqx">
+								<el-table-column label="结石" prop="count_n_js">
+								</el-table-column>
+								<el-table-column label="气线" prop="count_n_qx">
 								</el-table-column>
 								<el-table-column label="合计" prop="count_n_qt">
 								</el-table-column>
@@ -202,7 +206,8 @@
 								{value: 5, name: '断裂'},
 								{value: 6, name: '偏壁'},
 								{value: 3, name: '大小头'},
-								{value: 2, name: '结石气绒'},
+								{value: 2, name: '结石'},
+								{value: 2, name: '气线'},
 							]
 						}
 					]
@@ -229,7 +234,8 @@
 								{value: 6, name: '断裂'},
 								{value: 3, name: '偏壁'},
 								{value: 2, name: '大小头'},
-								{value: 3, name: '结石气绒'},
+								{value: 3, name: '结石'},
+								{value: 3, name: '气线'},
 								{value: 4, name: '箱中破'},
 							]
 						}
diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 1ce3ca9a..f08685ed 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -244,15 +244,30 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="结石气绒">
+          <el-form-item label="结石">
             <el-input-number
-              v-model="form.count_n_jsqx"
+              v-model="form.count_n_js"
               controls-position="right"
               :min="0"
               :step="1"
               :step-strictly="true"
               style="width: 100%"
-              placeholder="结石气绒"
+              placeholder="结石"
+              @change="countNotOkSun"
+            >
+            </el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="气线">
+            <el-input-number
+              v-model="form.count_n_qx"
+              controls-position="right"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+              style="width: 100%"
+              placeholder="气线"
               @change="countNotOkSun"
             >
             </el-input-number>
@@ -326,7 +341,8 @@ export default {
         count_n_dl:0,
         count_n_pb:0,
         count_n_dxt:0,
-        count_n_jsqx:0,
+        count_n_js:0,
+        count_n_qx:0,
         count_n_qt:0,
         handle_user:''
       },
@@ -432,7 +448,8 @@ export default {
       Number(this.form.count_n_dl) +
       Number(this.form.count_n_pb) +
       Number(this.form.count_n_dxt) +
-      Number(this.form.count_n_jsqx) +
+      Number(this.form.count_n_js) +
+      Number(this.form.count_n_qx) +
       Number(this.form.count_n_qt);
     },
     //提交
diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index ea2bb284..c94b2b35 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -126,7 +126,9 @@
                                             </el-table-column>
                                             <el-table-column label="大小头" prop="count_n_dxt">
                                             </el-table-column>
-                                            <el-table-column label="结石气绒" prop="count_n_jsqx">
+                                            <el-table-column label="结石" prop="count_n_js">
+                                            </el-table-column>
+                                            <el-table-column label="气线" prop="count_n_qx">
                                             </el-table-column>
                                             <el-table-column label="合计" prop="count_n_qt">
                                             </el-table-column>
diff --git a/src/views/wpm/mlog_dept6_detail.vue b/src/views/wpm/mlog_dept6_detail.vue
index 9a7ab1f1..2265a354 100644
--- a/src/views/wpm/mlog_dept6_detail.vue
+++ b/src/views/wpm/mlog_dept6_detail.vue
@@ -51,7 +51,8 @@
               <el-table-column prop="count_n_dl" label="断裂" />
               <el-table-column prop="count_n_pb" label="偏壁" />
               <el-table-column prop="count_n_dxt" label="大小头" />
-              <el-table-column prop="count_n_jsqx" label="结石气绒" />
+              <el-table-column prop="count_n_js" label="结石" />
+              <el-table-column prop="count_n_qx" label="气线" />
               <el-table-column prop="count_n_qt" label="其他" />
             </el-table-column>
             <el-table-column label="操作人" prop="update_by_name"></el-table-column>
diff --git a/src/views/wpm/mlog_drawer.vue b/src/views/wpm/mlog_drawer.vue
index b7af65a7..88cffa31 100644
--- a/src/views/wpm/mlog_drawer.vue
+++ b/src/views/wpm/mlog_drawer.vue
@@ -84,9 +84,14 @@
                                 <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_dxt }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="结石气绒">
+                        <el-table-column label="结石">
                             <template #default="scope">
-                                <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_jsqx }}</span>
+                                <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_js }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="气线">
+                            <template #default="scope">
+                                <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_qx }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="其他">
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index a8cb690f..e56c4813 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -431,7 +431,9 @@
               </el-table-column>
               <el-table-column label="大小头" prop="count_n_dxt">
               </el-table-column>
-              <el-table-column label="结石气绒" prop="count_n_jsqx">
+              <el-table-column label="结石" prop="count_n_js">
+              </el-table-column>
+              <el-table-column label="气线" prop="count_n_qx">
               </el-table-column>
               <el-table-column label="合计" prop="count_n_qt">
               </el-table-column>
diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index c46e0a19..682aa184 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -332,15 +332,30 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="结石气绒">
+          <el-form-item label="结石">
             <el-input-number
-              v-model="form.count_n_jsqx"
+              v-model="form.count_n_js"
               controls-position="right"
               :min="0"
               :step="1"
               :step-strictly="true"
               style="width: 100%"
-              placeholder="结石气绒"
+              placeholder="结石"
+              @change="countNotOkSun"
+            >
+            </el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="气线">
+            <el-input-number
+              v-model="form.count_n_qx"
+              controls-position="right"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+              style="width: 100%"
+              placeholder="气线"
               @change="countNotOkSun"
             >
             </el-input-number>
@@ -957,15 +972,30 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
-          <el-form-item label="结石气绒">
+          <el-form-item label="结石">
             <el-input-number
-              v-model="form.count_n_jsqx"
+              v-model="form.count_n_js"
               controls-position="right"
               :min="0"
               :step="1"
               :step-strictly="true"
               style="width: 100%"
-              placeholder="结石气绒"
+              placeholder="结石"
+              @change="countNotOkSun"
+            >
+            </el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="气线">
+            <el-input-number
+              v-model="form.count_n_qx"
+              controls-position="right"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+              style="width: 100%"
+              placeholder="气线"
               @change="countNotOkSun"
             >
             </el-input-number>
@@ -1032,8 +1062,10 @@ export default {
         count_n_dl: 0,
         count_n_pb: 0,
         count_n_dxt: 0,
-        count_n_jsqx: 0,
+        count_n_js: 0,
+        count_n_qx: 0,
         count_n_qt: 0,
+        count_break:0,
         mlogb: [],
       },
       mlogb: [],
@@ -1218,7 +1250,8 @@ export default {
           this.form.count_n_dl +
           this.form.count_n_pb +
           this.form.count_n_dxt +
-          this.form.count_n_jsqx;
+          this.form.count_n_js+
+          this.form.count_n_qx;
       } else if (this.activeType == "退火") {
         this.form.count_notok =
           this.form.count_n_wq +
@@ -1226,7 +1259,8 @@ export default {
           this.form.count_n_dl +
           this.form.count_n_pb +
           this.form.count_n_dxt +
-          this.form.count_n_jsqx +
+          this.form.count_n_js +
+          this.form.count_n_qx +
           this.form.count_break;
       }
     },
@@ -1259,7 +1293,8 @@ export default {
               this.form.count_n_dl +
               this.form.count_n_pb +
               this.form.count_n_dxt +
-              this.form.count_n_jsqx;
+              this.form.count_n_js +
+              this.form.count_n_qx;
             let ok_number = 0;
             this.mlogb.forEach((item) => {
               ok_number += item.count_ok;
@@ -1273,7 +1308,8 @@ export default {
               this.form.count_n_dl +
               this.form.count_n_pb +
               this.form.count_n_dxt +
-              this.form.count_n_jsqx +
+              this.form.count_n_js +
+              this.form.count_n_qx +
               this.form.count_break;
           }
           if (this.activeType == "10车间") {