From 16bc320eee29357111dff65c4fdca63a138f6450 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 06 八月 2024 17:03:40 +0800
Subject: [PATCH] 松套管

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a8be03c..77c724f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -295,6 +295,17 @@
           </el-radio-group>
         </div>
         <div style="display: flex;align-items: center;">
+          <span v-if="casing.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,3)" v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�'" size="small">
+            <el-option
+              v-for="item in casing"
+              :key="item.id"
+              :label="item.color"
+              :value="item.id">
+              <span style="float: left">{{ item.color}}</span>
+              <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="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
@@ -751,6 +762,7 @@
               size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
           </template>
         </el-table-column>
+        <el-table-column prop="checkName" label="妫�楠屼汉" min-width="80px" show-overflow-tooltip></el-table-column>
         <el-table-column prop="isLeave" label="鏄惁鐣欐牱" width="95px" show-overflow-tooltip align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
@@ -971,6 +983,7 @@
         temptList:null,
         fiber:[],
         fibers:[],
+        casing:[],
         currentTab:null,
         wareForm:{
           inspectionItem:1,
@@ -1166,11 +1179,13 @@
                 this.tableList = this.tableLists.filter(m => m.templateId == val1)
                 this.handleTableData()
               }
-              // this.$delete(this.tableList,0)
-              // this.$set(this.tableList, 0, m)
-              // this.handleTableData()
             }
           })
+          if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
+            if(this.casing.length>0){
+              this.handleChange(this.casing[0].id,3)
+            }
+          }
         }
       },
       equipForm:{
@@ -1276,6 +1291,32 @@
                 value:data[i][j].result,
                 frequency:data[i].frequency
               }
+              let list = this.tableList[0].arr
+              list.forEach((item,index)=>{
+                let num0 = 0;
+                let str = ''
+                let str0 = i+','+j
+                item.forEach(m=>{
+                  if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
+                    if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
+                      if(num0==0){
+                        str = m.v.v+','
+                        num0++
+                      }
+                    }
+                    if(m.v.ps&&m.v.ps.value=='妫�楠屽瓙椤�'){
+                      if(num0==1){
+                        str = str+m.v.v
+                      }
+                    }
+                  }
+                  if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
+                    if(!m.v.v){
+                      this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
+                    }
+                  }
+                })
+              })
             }else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){
               let str0 = i+','+j
               let list = this.tableList[0].arr
@@ -1306,6 +1347,7 @@
                       maxNum = num
                     }
                   }
+                  console.log('data[i][j].equipName',data[i][j].equipName,'data[i][j].equipValue',data[i][j].equipValue,'m.v',m.v,'m.v.ps',m.v.ps,'m.v.ps.value',m.v.ps.value,'str0',str0,'str',str,'m.v.v',m.v.v)
                   if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
                     if(!m.v.v){
                       this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
@@ -2036,6 +2078,8 @@
         this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
           this.fibers = res.data['鍏夌氦甯�']
           this.fiber = res.data['鍏夌氦']
+          this.casing = res.data['濂楃']
+          console.log(this.casing)
         })
       },
       async handleChange(m,type){

--
Gitblit v1.9.3