From 897faa2d11f5a64d0c5e0f3d802e363430f8bdc0 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 28 六月 2024 13:36:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b1-ins-order/add.vue |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 0e9813c..53ac6d8 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -117,7 +117,7 @@
   <div class="ins_order_add">
     <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-row class="title">
-        <el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭�&nbsp;&nbsp;&nbsp;鎬讳环锛�<span
+        <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="18" style="text-align: right;">
           <el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
@@ -914,14 +914,16 @@
         this.selectUserDia = false
       },
       containsValue(str) {
-        let symbolItem = ''
-        this.symbolList.some(value =>{
-          if(str.includes(value)){
-            symbolItem  = value
-            return true
-          }
-        })
-        return symbolItem
+        if(str){
+          let symbolItem = ''
+          this.symbolList.some(value =>{
+            if(str.includes(value)){
+              symbolItem  = value
+              return true
+            }
+          })
+          return symbolItem
+        }
       },
       handleAsk(ask,symbolItem, value) {
         try{
@@ -1001,6 +1003,9 @@
             let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
             if (isRTS) {
               this.editTable = this.handleData(sampleList,this.containsValue, 0)
+              this.editTable.forEach(item => {
+                item.value = item.modelNum
+              })
               this.bsm3Dia = true;
               return
             }
@@ -1009,8 +1014,12 @@
         }
       },
       save0(){
-        let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
-        this.saveMethod(sampleList)
+        if(this.editTable.every(m=>m.value)){
+          let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+          this.saveMethod(sampleList)
+        }else{
+          this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+        }
       },
       handleData(sampleList,calBack,type){
         let editTable = []
@@ -1020,6 +1029,7 @@
             model:item.model,
             symbolList:[],
             sampleId:item.id,
+            modelNum:item.modelNum,
           }
           if (item.insProduct && item.insProduct.length > 0) {
             item.insProduct.forEach(a => {
@@ -1188,6 +1198,7 @@
                 sampleId:a.sampleId,
                 value:null,
                 inspectionItemList:b.inspectionItemList,
+                modelNum:a.modelNum,
               }
               editTableNew.push(obj)
             })
@@ -1226,7 +1237,8 @@
           this.saveLoad = true
           this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
             state,
-            id: this.currentId
+            id: this.currentId,
+            companyId:this.addObj.companyId
           }, {
             headers: {
               'Content-Type': 'application/json'
@@ -1235,6 +1247,8 @@
             this.saveLoad = false
             if (res.code == 201) return
             this.$message.success('鎻愪氦鎴愬姛')
+            // this.$parent.multipleSelection = [{id: this.currentId}]
+            // this.$parent.print()
             // 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
             // if (this.addObj.type == 2) {
             // 	this.issuedDialogVisible = true;
@@ -1343,7 +1357,7 @@
         }
       },
       selectStandardTreeList() {
-        this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
+        this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
           this.list = res.data
           this.list.forEach(a => {
             this.expandedKeys.push(a.label)

--
Gitblit v1.9.3