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 | 110 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index d26207a..0979be9 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -120,6 +120,19 @@
.collection:active {
opacity: .7;
}
+ .table_caret{
+ font-size: 16px;
+ margin: 0 5px;
+ color: rgba(0, 0, 0, 0.1);
+ }
+ .table_caret:hover{
+ color: #409eff;
+ cursor: pointer;
+ }
+
+ .table_caret:active{
+ opacity: .8;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -224,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">
@@ -285,6 +298,16 @@
</el-select> -->
<span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧缂栧彿'">
+ <div style="display: flex;flex-wrap: nowrap;align-items: center;">
+ <i class="el-icon-caret-left table_caret" @click="caretSample(-1)"></i>
+ <div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div>
+ <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i>
+ </div>
+ </template>
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'">
+ <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&¤tSample.model!==null">{{currentSample.model}}</div>
+ </template>
<span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
</td>
@@ -325,9 +348,9 @@
:current-row-key="currentKey" :row-key="record=>record.index" v-if="bushingVisible">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
- <el-table-column prop="color" label="绠¤壊鏍�" min-width="110px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="num2" label="鏍囬噺" min-width="110px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="num3" label="娴嬭瘯閲�" min-width="90px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="color" label="绠¤壊鏍�" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="standNum" label="鏍囬噺" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="testNum" label="娴嬭瘯閲�" min-width="100px" show-overflow-tooltip></el-table-column>
</el-table>
</el-drawer>
<el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500">
@@ -470,6 +493,7 @@
currentFiberOpticTape:null,//褰撳墠鍏夌氦甯�
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
+ tableLoading:false,
}
},
created() {
@@ -490,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) {
@@ -498,7 +522,9 @@
}
})
this.sampleProduct = res.data.sampleProduct
- this.currentSample = this.sampleProduct[0]
+ 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: [],
@@ -510,6 +536,7 @@
}
})
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
+ let bushing = this.currentSample.bushing
this.loading = false
// this.handleTableData()
this.getTableLists();
@@ -523,6 +550,9 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ if(bushing&&bushing.length>0){
+ this.bushing = bushing
+ }
})
},
currentTable(val1, val0) {
@@ -538,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 = []
@@ -553,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] = {
@@ -565,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 = []
@@ -584,16 +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) {
- this.currentSample = row;
+ async handleChangeSample(row, column, event) {
this.param = {}
// 娓呯┖鍏夌氦閰嶇疆鐩稿叧鏁版嵁
this.fiberOpticTape = []
@@ -602,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: [],
@@ -613,13 +653,12 @@
insResult: null
}
})
- let bushing = this.currentSample.insProduct.bushing
+ let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
}
// this.handleTableData()
this.getTableLists();
- this.sampleVisible = false;
this.currentKey = row.index
},
handleChangeTask(row) {
@@ -711,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({
@@ -730,6 +769,7 @@
this.tableList = null;
this.tableList = [this.tableLists[0]]
this.currentTable = this.tableLists[0].templateId;
+ this.currentSample.insProduct = this.HaveJson(list)
this.handleTableData()
}
},
@@ -1021,6 +1061,15 @@
return res < m.split('<')[1]
}else if (m.includes('>')) {
return res > m.split('>')[1]
+ }else if (m.includes('~')) {
+ let k = m.split('~')
+ return res >= k[0] && res <= k[1]
+ }else if(m.includes('-')){
+ let k = m.split('-')
+ return res >= k[0] && res <= k[1]
+ }else if(m.includes('卤')){
+ let k = m.split('卤')
+ return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
}
})
if(this.getInspectionValueType(item.i)==1){
@@ -1436,6 +1485,31 @@
nav.addEventListener("mouseleave", function(event) {
flag = false;
});
+ },
+ async caretSample(num){
+ let index = this.currentKey + num
+ if(index < 1){
+ this.$message.error('褰撳墠鏄涓�涓牱鍝�')
+ return
+ } else if(index > this.sampleProduct.length){
+ this.$message.error('褰撳墠鏄渶鍚庝竴涓牱鍝�')
+ return
+ }
+ 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: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.getTableLists()
}
}
}
--
Gitblit v1.9.3