From 445c50119ba6133e5e8f929fcd71fff322a37f29 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 12 八月 2024 10:52:04 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 static/js/worker.js                                    |    4 +
 src/components/do/b1-ins-order/add.vue                 |    7 +--
 src/components/do/b1-inspect-order-plan/Inspection.vue |    4 +
 src/components/do/b1-ins-order/fiberoptic-config.vue   |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index f383120..5f0baee 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -759,7 +759,7 @@
                width="800px" :show-close="false">
       <el-table
       :data="editTable"
-      style="width: 100%">
+      style="width: 100%" height="80vh">
       <!-- inspectionItemList -->
       <el-table-column
           prop="inspectionItemList"
@@ -1184,12 +1184,11 @@
       inputValueHandler(row,index){
         if(row){
           const nextIndex = index+1
+          console.log(nextIndex, this.editTable)
           for (let i = nextIndex; i < this.editTable.length; i++) {
             const element = this.editTable[i];
-            if(element.model==row.model){
+            if(element.model==row.model&&row.symbolItem==element.symbolItem){
               this.editTable[i].value = row.value
-            }else{
-              break;
             }
           }
         }
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 7ae348a..a48781c 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -95,7 +95,7 @@
               </el-table-column> -->
               <el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
+                  <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row,'ask')"></el-input>
                   <span v-else>{{ scope.row.ask }}</span>
                 </template>
               </el-table-column>
@@ -561,7 +561,104 @@
         }
       },
 
-      changeASk(row) {
+      changeASk(row,type) {
+        if(type == 'ask') {
+          // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿
+          if(row.tell.indexOf('卤') != -1) {
+            let left = row.tell.substring(0,row.tell.indexOf('卤'))
+            let right = row.tell.substring(row.tell.indexOf('卤')+1)
+            // 濡傛灉鍙互杞寲涓烘暟鍊�
+           if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) {
+                    this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                    row.ask = (Number(left) - Number(right)) + '-' + (Number(left) + Number(right))
+                  }
+              }else {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖')
+                row.ask = left + '-' + right
+                return
+              }
+           }
+           // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊�
+           else if(isNaN(Number(left)) && !isNaN(Number(right))) {
+            const regex = /[~-]/
+            const match = left.match(regex)
+            // 宸﹁竟鍚湁 - ~ 绗﹀彿
+            if(match) {
+              let newLeft = '';
+              if(left.includes('锛�')) {
+               newLeft = left.replace('锛�','(')
+              }
+              if(left.includes('锛�')) {
+                newLeft = newLeft.replace('锛�',')')
+              }
+              const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/;
+              const matchTwo = newLeft.match(regexTwo);
+              let leftTwo = Number(matchTwo[1]) - Number(right)
+              let rightTwo = Number(matchTwo[4]) + Number(right)
+              console.log(matchTwo);
+              console.log(leftTwo,rightTwo);
+
+              console.log(row.ask.indexOf('-'));
+              if(row.ask.indexOf('-') != -1) {
+                  let left1 = row.ask.substring(0,row.ask.indexOf('-'))
+                  let right1 = row.ask.substring(row.ask.indexOf('-')+1)
+                  if(Number(left1) != leftTwo || Number(right1) != rightTwo) {
+                    this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                    row.ask = leftTwo + '-' + rightTwo
+                  }
+              }else {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖')
+                row.ask = leftTwo + '-' + rightTwo
+                return
+              }
+            }
+           }
+          }
+          // 濡傛灉妫�娴嬭姹傚惈鏈夆墹 < 鈮� > 绗﹀彿
+          const regex = /[鈮�<鈮�>]/
+          const match = row.tell.match(regex)
+          if(match) {
+            // 绗﹀彿涓嶄竴鑷�
+            if( row.ask.indexOf(match[0]) != 0) {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = match[0]
+                return
+              }else {
+                // 绗﹀彿涓�鑷�
+                const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g')
+                const matchTow = row.tell.match(regex);
+              let right =  Number(matchTow[0].split(match[0])[1])
+              let left = row.ask.substring(row.ask.indexOf(match[0])+1)
+              if(Number(left) != Number(right)) {
+                this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                row.ask = match[0] + right
+              }
+              }
+            }
+            // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿
+            const regexTwo = /[~-]/
+            const matchTwo = row.tell.match(regexTwo)
+            const matchAsk = row.ask.match(regexTwo)
+            if(matchTwo) {
+              let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0]))
+              let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1)
+
+
+              if(!isNaN(Number(left)) && !isNaN(Number(right))) {
+                let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0]))
+                let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1)
+                if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) {
+                  this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪')
+                  row.ask = left + '-' + right
+                }
+              }
+            }
+          }
+
         // 鍏堝嬀閫夌殑鎯呭喌涓�
           this.detectionSelect.forEach(item => {
             if(item.id == row.id) {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 9743c17..e3a9d18 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2650,6 +2650,7 @@
           } catch (e) {}
           try {
             let equipName = JSON.parse(a.insProductResult.equipName)
+            // console.log(2222222,equipName)
             if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
               this.param[a.id].equipName = []
               for (let i = 0; i < equipName.length; i++) {
@@ -2661,7 +2662,8 @@
               }
             }
             for (let i = 0; i < equipName.length; i++) {
-              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁崌璇曢獙鍘熷璁板綍妯℃澘')){
+              if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+                console.log(2222222,equipName)
                 // 娓╁害寰幆璧嬪��
                 this.$set(this.equipForm,`value`+i,equipName[i].v)
                 this.param[a.id].equipName[i].v.v = equipName[i].v
diff --git a/static/js/worker.js b/static/js/worker.js
index e9efd59..580ae6e 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -325,7 +325,7 @@
             isPoint = PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
             comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
             let list3 = list2.map(item=>item+'')
-            isToExponential = list3.some(val => val.includes('e+'))
+            isToExponential = list3.some(val => val.includes('e+')||val.includes('e-'))
             // 瑁呭椤圭洰妫�楠屽�艰浆鍖�
             if (PROJECT === '瑁呭鐢电紗' && isToExponential) {
               let num2 = new Big(comResult)
@@ -368,6 +368,8 @@
                       let str = a[b].v.ct.fa.split('.')[1]
                       num = str.length
                       a[b].v.v = comResult?Number(comResult).toFixed(num):comResult
+                    }else if(comResult.includes('e+')|| comResult.includes('e-')){
+                      a[b].v.v = comResult
                     }else{
                       let val = parseFloat(Number(comResult).toFixed(3))
                       a[b].v.v = isNaN(val) ? comResult : val

--
Gitblit v1.9.3