From df1250120c3821ec701def9b899e3586a33beaa2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 08 七月 2024 15:07:26 +0800
Subject: [PATCH] 修改检验下单

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

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 05a6303..2769482 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -397,7 +397,7 @@
       </div>
       <div class="center-box" v-loading="tableLoading" v-else>
         <el-divider></el-divider>
-        <h4 style="margin-bottom: 20px;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+        <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
         <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
         <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
           <el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
@@ -445,7 +445,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="浠櫒鍚嶇О:" style="margin-left: 80px;">
+          <el-form-item label="浠櫒鍚嶇О:" >
             <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
           </el-form-item>
           <el-form-item label="浠櫒缂栧彿:">
@@ -524,14 +524,14 @@
             prop="resValue"
             label="琛板噺宸�"
             align="center"
-            v-if="wareForm.inspectionItemSubclass!=20"
+            v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
             min-width="150">
           </el-table-column>
           <el-table-column
             prop="insResult"
             label="缁撹"
             align="center"
-            min-width="150" v-if="wareForm.inspectionItemSubclass!=20">
+            min-width="150" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'">
             <template slot-scope="scope">
               <span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
               <span v-else-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
@@ -793,7 +793,7 @@
         currentTab:null,
         wareForm:{
           inspectionItem:1,
-          inspectionItemSubclass:20,
+          inspectionItemSubclass:'20(甯告俯)',
         },
         wareForm0:{},
         numOptions:[],
@@ -977,7 +977,7 @@
               v:row.comValue
             }
           }]
-        if(this.wareForm.inspectionItemSubclass!=20){
+        if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
           row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
           this.param[row.id].resValue.v.v = row.resValue
           if(row.ask&&row.resValue){
@@ -1005,10 +1005,14 @@
           return
         }
         if(m&&type){
-          this.wareForm[type] = Number(m)
+          this.wareForm[type] = m
         }
         let wareForm = {...this.wareForm}
-        wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+        if(this.wareForm.inspectionItemSubclass=='20(甯告俯)'){
+          wareForm.inspectionItemSubclass ='20鈩�(甯告俯)'
+        }else{
+          wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+        }
         this.wareTableDataLoading = true
         this.$axios.post(this.$api.insOrderPlan.temCycle,{
           sampleId:this.currentSample.id,
@@ -1398,7 +1402,7 @@
           this.temperatureOptions = []
           mySet1.forEach(m => {
             this.temperatureOptions.push({
-              value:m,
+              value:String(m),
               label:m
             })
           })
@@ -1433,7 +1437,6 @@
             count++
           })
         })
-        // 闂寮�濮�
         this.tableList.forEach(a => {
           let dels = new Set()
           let ids = []
@@ -1490,7 +1493,6 @@
               }
             }
           })
-          // return
           ids.forEach(id => {
             for (let b = 0; b < a.template.length; b++) {
               if (a.template[b].r === id.r) {
@@ -1525,7 +1527,6 @@
             }
           })
         })
-        // 闂缁撴潫
         this.tableList.forEach(a => {
           let arrs = []
           let set = new Set()
@@ -1769,7 +1770,6 @@
                       value: 0,
                     })
                   })
-                  console.log(comValue)
                   for (var a in comValue) {
                     valueList.forEach(b => {
                       if (b.name == a) {
@@ -1917,7 +1917,8 @@
           }
       },
       getValue(v){
-        let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v:'').replaceAll('\n','<br/>')
+        let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
+        // str.replace(new RegExp(search, 'g'), replace)
         return str
       },
       getInspectionValueType(id) {

--
Gitblit v1.9.3