From d1b46161801b8b4641bdec066796d75d80eebb2f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 13:36:17 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 391167a..b3ed844 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -325,9 +325,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">
@@ -393,9 +393,6 @@
</template>
<script>
- import {
- set
- } from 'shelljs';
import ValueTable from '../../tool/value-table.vue'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
@@ -501,7 +498,7 @@
}
})
this.sampleProduct = res.data.sampleProduct
- this.currentSample = this.sampleProduct[0]
+ this.currentSample = this.HaveJson(this.sampleProduct[0])
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -513,6 +510,7 @@
}
})
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
+ let bushing = this.currentSample.bushing
this.loading = false
// this.handleTableData()
this.getTableLists();
@@ -526,6 +524,9 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ if(bushing&&bushing.length>0){
+ this.bushing = bushing
+ }
})
},
currentTable(val1, val0) {
@@ -596,7 +597,6 @@
this.currentKey = row.index
},
handleChangeSample(row, column, event) {
- this.currentSample = row;
this.param = {}
// 娓呯┖鍏夌氦閰嶇疆鐩稿叧鏁版嵁
this.fiberOpticTape = []
@@ -605,7 +605,7 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
-
+ this.currentSample.insProduct = this.HaveJson(row.insProduct)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -616,7 +616,7 @@
insResult: null
}
})
- let bushing = this.currentSample.insProduct.bushing
+ let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
}
@@ -733,6 +733,7 @@
this.tableList = null;
this.tableList = [this.tableLists[0]]
this.currentTable = this.tableLists[0].templateId;
+ this.currentSample.insProduct = this.HaveJson(obj.productList)
this.handleTableData()
}
},
@@ -1024,6 +1025,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){
--
Gitblit v1.9.3