From 8d1f60e54adb75d9c252b514174f287a2cbd7864 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 16:28:28 +0800
Subject: [PATCH] 完成检验下单、检验任务优化
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b3ed844..936331e 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -224,7 +224,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">
@@ -470,6 +470,7 @@
currentFiberOpticTape:null,//褰撳墠鍏夌氦甯�
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
+ tableLoading:false,
}
},
created() {
@@ -542,6 +543,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 = []
@@ -557,7 +564,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] = {
@@ -569,11 +576,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 = []
@@ -588,15 +596,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 = []
@@ -605,7 +614,9 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
- this.currentSample.insProduct = this.HaveJson(row.insProduct)
+ this.sampleVisible = false;
+ let list = await this.getCurrentProduct(row.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -622,7 +633,6 @@
}
// this.handleTableData()
this.getTableLists();
- this.sampleVisible = false;
this.currentKey = row.index
},
handleChangeTask(row) {
@@ -714,9 +724,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({
@@ -733,7 +743,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()
}
},
--
Gitblit v1.9.3