From d7b4cbde92aa4a6f6e68ae755f1c04477ca2127d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 17:57:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b1-ins-order/add.vue |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index efadf12..328cd5b 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -164,7 +164,8 @@
         </el-col>
       </el-row>
     </div>
-    <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
+    <div style="height: (100vh - 200px);">
+      <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
       <el-row>
         <el-col class="search_thing" :span="6">
           <div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -511,6 +512,7 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
     </div>
     <el-dialog title="閫夋嫨鍗曚綅" :visible.sync="selectUserDia" width="70%">
       <div class="body" style="height: 60vh;" v-if="selectUserDia">
@@ -1363,6 +1365,14 @@
           this.temperatureData = this.temperatureData.slice(0,-deleteNum)
         }
       },
+      changeProductList0(){
+        this.productList0.forEach(a=>{
+          let obj = this.productList.find(m => m.id == a.id)
+          if(obj){
+            a.state = obj.state
+          }
+        })
+      },
       searchFilterList () {
         const vtw = {
           inspectionItem: this.inspectionItem, // 妫�楠岄」
@@ -1372,6 +1382,7 @@
         const isHaveValue = Object.values(vtw).some(item => {
           return item
         })
+        this.changeProductList0()
         if (isHaveValue) {
           for(let i in vtw) {
             if (vtw[i]) {
@@ -1380,9 +1391,19 @@
               })
             }
           }
+          this.$nextTick(()=>{
+            this.productList.forEach(a => {
+              if (a.state == 1) this.toggleSelection(a)
+            })
+          })
         } else {
           // 娌℃湁鏌ヨ鏉′欢鏃舵覆鏌撴墍鏈夋暟鎹�
           this.productList = this.productList0
+          this.$nextTick(()=>{
+            this.productList.forEach(a => {
+              if (a.state == 1) this.toggleSelection(a)
+            })
+          })
         }
       },
       getAuthorizedPerson() {
@@ -2134,7 +2155,7 @@
           return item
         })
         const select = this.selectTree.split(' - ')
-        if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 1) {
+        if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 1&&this.isAskOnlyRead) {
           this.circulateShow = true;
           return
         } else if (row.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && row.state === 0) {
@@ -2150,6 +2171,8 @@
         } else if ((row.inspectionItem === '娓╁崌璇曢獙' || row.inspectionItem === '鐑惊鐜�') && row.state === 0) {
           this.temperatureShow = false;
         }
+        this.changeProductList0()
+        this.currentMethod.insProduct = this.productList0
         this.getProNum()
       },
       searchProject () {
@@ -2437,7 +2460,7 @@
             return
           }
           const select = this.selectTree.split(' - ')
-          if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1) {
+          if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 1&&this.isAskOnlyRead) {
             this.circulateShow = true;
             return
           } else if (p.inspectionItem === '娓╁害寰幆' && select[2] === '鍏夌紗' && p.state === 0) {
@@ -2482,6 +2505,8 @@
             return item
           })
         }
+        this.changeProductList0()
+        this.currentMethod.insProduct = this.productList0
         this.getProNum()
         this.$nextTick(() => {
           this.$refs.productTable.doLayout()

--
Gitblit v1.9.3