From adfe1ca87e734e564b56a42c6fc5d015b4858eb3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 20:37:49 +0800
Subject: [PATCH] 修改任务检验

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 642ba7f..0979be9 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -237,7 +237,7 @@
             size="small">{{ item.templateName }}</el-radio-button>
         </el-radio-group>
       </div>
-      <div class="center-box" id="nav">
+      <div class="center-box" id="nav" v-loading="tableLoading">
         <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
           <tbody>
             <tr v-for="(m,i) in item.arr" :key="i">
@@ -493,6 +493,7 @@
         currentFiberOpticTape:null,//褰撳墠鍏夌氦甯�
         currentFiberOptic:null,//褰撳墠鍏夌氦
         currentBushing:null,//褰撳墠濂楃
+        tableLoading:false,
       }
     },
     created() {
@@ -513,7 +514,7 @@
         this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
           id: val,
           laboratory: this.sonLaboratory
-        }).then(res => {
+        }).then(async res => {
           this.insOrder = res.data.insOrder;
           this.urgentList.forEach(m => {
             if (m.value == this.insOrder.type) {
@@ -522,6 +523,8 @@
           })
           this.sampleProduct = res.data.sampleProduct
           this.currentSample = this.HaveJson(this.sampleProduct[0])
+          let list = await this.getCurrentProduct(this.currentSample.id,0)
+          this.currentSample.insProduct = this.HaveJson(list)
           this.currentSample.insProduct.forEach(a => {
             this.param[a.id] = {
               insValue: [],
@@ -565,6 +568,12 @@
       }
     },
     methods: {
+      async getCurrentProduct(id,type){
+        this.tableLoading = true;
+        let res = await this.$axios.post(this.$api.insOrderPlan.getInsProduct+'?id='+id+'&type='+type+'&laboratory='+this.sonLaboratory)
+        this.tableLoading = false;
+        return res.data
+      },
       handleChangeBushing(row, column, event){
         this.currentBushing = row;
         this.fiberOpticTape = []
@@ -580,7 +589,7 @@
         }
         this.bushingVisible = false;
       },
-      handleChangeOptic(row, column, event){
+      async handleChangeOptic(row, column, event){
         this.currentFiberOptic = row;
         this.currentFiberOptic.productList.forEach(a => {
           this.param[a.id] = {
@@ -592,11 +601,12 @@
             insResult: null
           }
         })
-        this.getTableLists0(row)
         this.fiberOpticVisible = false;
+        let list = await this.getCurrentProduct(row.id,2)
+        this.getTableLists0(list)
         this.currentKey = row.index
       },
-      handleChangeTape(row, column, event){
+      async handleChangeTape(row, column, event){
         this.currentFiberOpticTape = row;
         this.param = {}
         this.fiberOptic = []
@@ -611,15 +621,16 @@
             insResult: null
           }
         })
-        this.getTableLists0(row)
+        this.fiberOpticTapeVisible = false;
+        let list = await this.getCurrentProduct(row.id,1)
+        this.getTableLists0(list)
         if(row.fiber&&row.fiber.length>0){
           // 閰嶇疆鍏夌氦
           this.fiberOptic = row.fiber;
         }
-        this.fiberOpticTapeVisible = false;
         this.currentKey = row.index
       },
-      handleChangeSample(row, column, event) {
+      async handleChangeSample(row, column, event) {
         this.param = {}
         // 娓呯┖鍏夌氦閰嶇疆鐩稿叧鏁版嵁
         this.fiberOpticTape = []
@@ -628,7 +639,10 @@
         this.currentFiberOptic = null;
         this.bushing = []
         this.currentBushing = null;
+        this.sampleVisible = false;
         this.currentSample = this.HaveJson(row)
+        let list = await this.getCurrentProduct(row.id,0)
+        this.currentSample.insProduct = this.HaveJson(list)
         this.currentSample.insProduct.forEach(a => {
           this.param[a.id] = {
             insValue: [],
@@ -645,7 +659,6 @@
         }
         // this.handleTableData()
         this.getTableLists();
-        this.sampleVisible = false;
         this.currentKey = row.index
       },
       handleChangeTask(row) {
@@ -737,9 +750,9 @@
         }
       },
       // 鍏夌氦閰嶇疆鐩稿叧妯℃澘table鍒楄〃
-      getTableLists0(obj){
+      getTableLists0(list){
         const mySet1 = new Set();
-        this.tableLists = obj.productList.filter(m => {
+        this.tableLists = list.filter(m => {
           let num0 = mySet1.size;
           if (m.templateId != null&&m.template != null) {
             mySet1.add(JSON.stringify({
@@ -756,7 +769,7 @@
           this.tableList = null;
           this.tableList = [this.tableLists[0]]
           this.currentTable = this.tableLists[0].templateId;
-          this.currentSample.insProduct = this.HaveJson(obj.productList)
+          this.currentSample.insProduct = this.HaveJson(list)
           this.handleTableData()
         }
       },
@@ -1473,7 +1486,7 @@
           flag = false;
         });
       },
-      caretSample(num){
+      async caretSample(num){
         let index = this.currentKey + num
         if(index < 1){
           this.$message.error('褰撳墠鏄涓�涓牱鍝�')
@@ -1484,6 +1497,8 @@
         }
         this.currentKey = index
         this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
+        let list = await this.getCurrentProduct(this.currentSample.id,0)
+        this.currentSample.insProduct = this.HaveJson(list)
         this.currentSample.insProduct.forEach(a => {
           this.param[a.id] = {
             insValue: [],

--
Gitblit v1.9.3