From 238de511e070c23bfd87a24f33da5c507875a259 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 02 七月 2024 09:53:23 +0800
Subject: [PATCH] 正式库lucksheet 优化

---
 src/components/do/b1-ins-order/add.vue |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 8c77e2a..43b5833 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -734,6 +734,28 @@
         </el-row>
       </span>
     </el-dialog>
+    <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="800px" :show-close="false">
+      <div class="search" style="display: flex;background: transparent;">
+        <div class="search_thing">
+          <div class="search_label">淇濇俯鏃堕棿锛�</div>
+          <div class="search_input">
+            <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+          </div>
+        </div>
+        <div class="search_thing">
+          <div class="search_label">寰幆娆℃暟锛�</div>
+          <div class="search_input">
+            <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+          </div>
+        </div>
+        <div class="search_thing">
+          <div class="search_label">娓╁害鐐癸細</div>
+          <div class="search_input">
+            <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -903,6 +925,9 @@
         inspectionItem:null,
         inspectionItemSubclass:null,
         methodS:null,
+        circulateShow:false,
+        circulateForm:{},
+        isBsm2Val2:false
       }
     },
     watch: {
@@ -1354,7 +1379,8 @@
           this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
             state,
             id: this.currentId,
-            companyId:this.addObj.companyId
+            companyId:this.addObj.companyId,
+            laboratory:this.addObj.laboratory
           }, {
             headers: {
               'Content-Type': 'application/json'
@@ -1613,7 +1639,6 @@
         this.$refs.productTable.toggleRowSelection(row, true);
       },
       upProductSelect(selection, row) {
-        console.log('danxuan', row)
         this.bsm1DiaList = []
         row.state = row.state == 1 ? 0 : 1
         if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
@@ -1626,7 +1651,7 @@
         } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
           row.bsm1 = false
         }
-        if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
+        if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1&&!this.isBsm2Val2) {
           this.bsm2 = true
           this.bsm1Dia = true
           if (this.bsm2Val2.length === 0) {
@@ -1634,9 +1659,9 @@
             this.computationalPairing(this.sampleList.length)
             this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
           }
-        } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
+        } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
           this.bsm2 = false
-        } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2) {
+        } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
           this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
           row.state = row.state == 1 ? 0 : 1
           this.$refs.productTable.toggleRowSelection(row, false)
@@ -1662,6 +1687,10 @@
           }
           return item
         })
+        if (row.inspectionItem === '娓╁害寰幆') {
+          this.circulateShow = true;
+          return
+        }
         this.getProNum()
       },
       permute(nums) {
@@ -1909,7 +1938,7 @@
           } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
             p.bsm1 = false
           }
-          if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
+          if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1&&!this.isBsm2Val2) {
             this.bsm2 = true
             this.bsm1Dia = true
             if (this.bsm2Val2.length === 0) {
@@ -1917,9 +1946,9 @@
               this.computationalPairing(this.sampleList.length)
               this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
             }
-          } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1 && this.sampleList.length > 1) {
+          } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && p.state === 1 && this.sampleList.length > 1) {
             this.bsm2 = false
-          } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2) {
+          } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length < 2) {
             this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
             this.$refs.productTable.clearSelection()
             return
@@ -2162,6 +2191,7 @@
               return
             }
           }
+          this.isBsm2Val2 = true;
         }
         // if(this.bsm3){
         //   if(!this.bsm3Val){

--
Gitblit v1.9.3