From 5d437a0ad1bfcdbb3b388358bd8bd0dc4954f259 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 08 八月 2024 09:30:18 +0800
Subject: [PATCH] 修改

---
 src/components/do/b1-ins-order/add.vue                 |    4 +---
 src/main.js                                            |    2 +-
 src/components/do/b1-inspect-order-plan/Inspection.vue |   18 ++++++++++++------
 src/view/timer.vue                                     |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 033ba53..03aead4 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1593,9 +1593,7 @@
           }
 
           console.log('isHaveBushing===', this.totalArr)
-          // inspectionItem
-          let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
-          // console.log('isHaveBushing===', isHaveBushing)
+          let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
           if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
             this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
             this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 2f55a89..54643da 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1051,7 +1051,8 @@
           }
         ],
         getDataIndex:[],
-        getDataIndexLoading:false
+        getDataIndexLoading:false,
+        changeType:null,
       }
     },
     computed: {
@@ -1143,6 +1144,15 @@
       },
       currentTable(val1, val0) {
         if (val0 != null && val1 != val0) {
+          if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
+            if(this.casing.length>0){
+              this.handleChange(this.casing[0].id,3)
+            }
+            return
+          }
+          if(this.changeType&&changeType>0){
+            return
+          }
           this.tableLists.forEach(async (m, i) => {
             if (m.templateId == val1) {
               let list = await this.getCurrentProduct(this.currentSample.id,0)
@@ -1185,11 +1195,6 @@
             }
           })
           this.handleCasing()
-          if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
-            if(this.casing.length>0){
-              this.handleChange(this.casing[0].id,3)
-            }
-          }
         }
       },
       equipForm:{
@@ -2094,6 +2099,7 @@
         })
       },
       async handleChange(m,type){
+        this.changeType = type
         if(m){
           let list = await this.getCurrentProduct(m,type)
           if(list.length>0){
diff --git a/src/main.js b/src/main.js
index ddc5532..c3b1ea1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@
 //鏈湴
 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.92.249:8001';
+const javaApi = 'http://192.168.0.104:8001';
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
 // const javaApi = 'http://114.132.189.42:1234';
diff --git a/src/view/timer.vue b/src/view/timer.vue
index 12a66ce..a34b8f9 100644
--- a/src/view/timer.vue
+++ b/src/view/timer.vue
@@ -35,7 +35,7 @@
       const hours = now.getHours();
       const minutes = now.getMinutes();
 
-      if (hours === 20 && minutes === 0) {
+      if (hours === 22 && minutes === 0) {
         this.performTask();
         // 璁剧疆20鍒嗛挓鍚庢彁绀哄叧闂�
         this.closeTimeout = setTimeout(() => {

--
Gitblit v1.9.3