From 7257363fabc7b4f11fb5dfa1a553b1bc6f89bd02 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 七月 2024 16:14:39 +0800
Subject: [PATCH] 检验任务-k检验值输入不进去

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index afe938b..a9c309d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -285,8 +285,8 @@
           </el-radio-group>
         </div>
         <div style="display: flex;align-items: center;">
-          <span v-if="fibers.length>0">&nbsp;&nbsp;鍏夌氦甯︼細</span>
-          <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
+          <span v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">&nbsp;&nbsp;鍏夌氦甯︼細</span>
+          <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
             <el-option
               v-for="item in fibers"
               :key="item.value"
@@ -296,8 +296,8 @@
               <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
             </el-option>
           </el-select>
-          <span v-if="fiber.length>0">&nbsp;&nbsp;鍏夌氦锛�</span>
-          <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
+          <span v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">&nbsp;&nbsp;鍏夌氦锛�</span>
+          <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small">
             <el-option
               v-for="item in fiber"
               :label="item.bushColor+'-'+item.color"
@@ -2186,8 +2186,7 @@
           conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
           finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
           a.template.forEach( b => {
-            if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
-                .length === 4)) {
+            if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc).length === 4)) {
               count1++
               b.v.v = count1
             }
@@ -2195,12 +2194,14 @@
               b.v.v = this.getAsk(b.i)
             }
             if (b.v.ps != undefined && typeof b.v.ps.value ==='string'&&b.v.ps.value.includes('妫�楠屽��')) {
-              b.v.v = ''
+              this.$set(b.v, 'v','' )
+              // b.v.v = ''
               b.u = ''
               b.i && this.param[b.i].insValue.push(b)
             }
             if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
-              b.v.v = ''
+              this.$set(b.v, 'v','' )
+              // b.v.v = ''
               b.i && this.param[b.i].comValue.push(b)
             }
             if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
@@ -2570,11 +2571,16 @@
         return sum
       },
       handleInput (n) {
-        n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
-        n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
-        n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
-        n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
-        n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
+        try {
+          n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
+          n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
+          n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+          n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
+          n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
+        } catch (error) {
+          console.log(error);
+        }
+
       },
       getInspectionItemType(id) {
         for (var a in this.currentSample.insProduct) {
@@ -2774,7 +2780,6 @@
         return
       },
       saveInsContext() {
-        // console.profile()
         // console.log(1111,this.param)
         try {
           if(this.param){
@@ -2787,6 +2792,12 @@
               }
               this.$message.success('宸蹭繚瀛�')
             })
+            // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+            this.worker.postMessage(JSON.stringify({
+              type: 'saveData',
+              tableList:this.tableList,
+              param:this.param
+            }));
           }
         }catch (error) {
           console.log(999,error);
@@ -2814,7 +2825,7 @@
             })
           }
         }
-        console.log(this.param)
+        // console.log(this.param)
         this.saveInsContext()
       },
       getAuthorizedPerson() {

--
Gitblit v1.9.3