From 0406078b52bc6b5e6eed97ca7e42e559f786289b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 22 十月 2024 15:56:51 +0800
Subject: [PATCH] 报告编制预览功能修改

---
 src/components/do/b1-ins-order/add.vue |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c235e47..daa5066 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -134,8 +134,8 @@
   <div class="ins_order_add" style=" display: block; ">
     <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-row class="title">
-        <el-col :span="6" style="padding-left: 20px;text-align: left;">濮旀墭鍗曚俊鎭�&nbsp;&nbsp;&nbsp;鎬讳环锛�<span
-            style="color: #3A7BFA">锟{total}}</span></el-col>
+        <el-col :span="6" style="padding-left: 20px;text-align: left;">濮旀墭鍗曚俊鎭�&nbsp;&nbsp;&nbsp;鍗曚綅鎴愭湰鎬讳环锛�<span
+            style="color: #3A7BFA">锟{total.toFixed(2)}}</span></el-col>
         <el-col :span="18" style="text-align: right;">
           <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
             @change="selectInsOrderTemplateById">
@@ -1906,6 +1906,22 @@
           //   }
           // }
           let sampleList = this.HaveJson(this.sampleList)
+          for (let i = 0; i < sampleList.length; i++) {
+            if (sampleList[i].insProduct.length > 0) {
+              let set = new Set()
+              for (let j = 0; j < sampleList[i].insProduct.length; j++) {
+                if(sampleList[i].insProduct[j].state == 1){
+                  let num0 = set.size
+                  set.add(sampleList[i].insProduct[j].inspectionItem+'-'+sampleList[i].insProduct[j].inspectionItemSubclass)
+                  let num1 = set.size
+                  if(num0==num1){
+                    this.$message.error(sampleList[i].insProduct[j].inspectionItem+'-'+sampleList[i].insProduct[j].inspectionItemSubclass+'閲嶅')
+                    return
+                  }
+                }
+              }
+            }
+          }
           let projectNum = this.totalArr.filter(a => a.state == 1).length
           if(projectNum==0){
             this.$confirm('妫�楠岄」鐩负绌猴紝鏄惁纭鎻愪氦?', "鎻愮ず", {
@@ -1916,7 +1932,7 @@
               this.saveMethod(sampleList)
             }).catch(() => {})
           }else{
-            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
+            let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask&&a.ask.includes(b)) && a.state == 1)
             if (isRTS&&this.PROJECT=='妫�娴嬩腑蹇�') {
               this.editTable = this.handleData(sampleList,this.containsValue, 0)
               this.editTable.forEach(item => {
@@ -2075,7 +2091,7 @@
                   let arr = this.editTable.filter(b => b.sampleId == item.id)
                   for (var i=0;i<arr.length;i++){
                     if(a.ask){
-                      if(a.ask.includes(arr[i].symbolItem)){
+                      if(a.ask&&a.ask.includes(arr[i].symbolItem)){
                         let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
                         if (ask) {
                           a.ask = ask

--
Gitblit v1.9.3