From 5c8aaba66c16b1a143fdec27e29ad36eaefd1e3a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:33:25 +0800
Subject: [PATCH] 无源器件检验开发
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 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 e3ef30e..54e89e4 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -259,8 +259,8 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">妫�楠屽崟璇︽儏
</el-col>
- <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;margin-bottom: 16px;">
- <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">鐢佃皟/闈炵數璋冩ā鏉垮垏鎹�</el-button>
+ <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;height: 60px;">
+ <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')&&insOrder.sampleType!='鏃犳簮鍣ㄤ欢'">鐢佃皟/闈炵數璋冩ā鏉垮垏鎹�</el-button>
<el-select v-model="template" size="medium" placeholder="鐢佃矾棰勮妯℃澘" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')"
@change="selectInsProductTemplateById">
<el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
@@ -738,8 +738,12 @@
<!-- 鐢佃矾璇曢獙 -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')" style="width: 100%;overflow-x: auto;overflow-y: visible;">
<!-- <Circuit></Circuit> -->
+ <!-- 鐢佃皟 -->
<CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters1>
+ <!-- 闈炵數璋� -->
<CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters2>
+ <!-- 鏃犳簮鍣ㄤ欢 -->
+ <CircuitParameters3 v-if="this.insOrder.sampleType=='鏃犳簮鍣ㄤ欢' " :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters3>
</div>
<!-- 娓╂箍搴﹁瘯楠� -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╂箍搴﹁瘯楠�')">
@@ -963,6 +967,7 @@
import excelFunction from '../../../util/excelFountion'
import CircuitParameters1 from './circuit-parameters1.vue'
import CircuitParameters2 from './circuit-parameters2.vue'
+ import CircuitParameters3 from './circuit-parameters3.vue'
import Humidity from './humidity.vue'
import PowerCapacity from './power-capacity.vue'
import filePreview from '../../tool/file-preview.vue'
@@ -972,6 +977,7 @@
ValueTable,
CircuitParameters1,
CircuitParameters2,
+ CircuitParameters3,
filePreview,
Humidity,
PowerCapacity,
@@ -1206,7 +1212,6 @@
this.scrollInit()
this.getPower()
this.startWorker()
- this.selectInsProductTemplate()
},
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
@@ -1220,6 +1225,7 @@
this.componentData0.entity.insSampleId = val;
this.componentData0.entity.insOrderId = this.orderId0;
this.$refs.fileList.selectList()
+ this.selectInsProductTemplate()
this.urgentList.forEach(m => {
if (m.value == this.insOrder.type) {
this.insOrder.typeName = m.label
@@ -2445,7 +2451,7 @@
this.tableList = null;
this.tableList = [this.tableLists[0]]
this.currentTable = this.tableLists[0].templateId;
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐢佃矾璇曢獙')&&this.currentTableState!=0&&this.currentTableState!=1){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐢佃矾璇曢獙')&&this.currentTableState!=0&&this.currentTableState!=1&&this.insOrder.sampleType!='鏃犳簮鍣ㄤ欢'){
this.versionDialogVisible = true
}
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
@@ -3328,8 +3334,12 @@
this.$message.error('璇疯緭鍏ユ箍搴�')
return
}
+ this.loading = true
if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!(await this.$refs.CircuitParameters.saveAll())){
+ this.loading = false
return
+ }else{
+ this.loading = false
}
this.experimentDia = true
this.newUserInfo = []
@@ -3728,9 +3738,9 @@
if(this.sonLaboratory === '鐢佃矾璇曢獙'){
// // 鐢佃矾璇曢獙鏁伴噰
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
- // let list = await this.getCurrentProduct(this.currentSample.id,0)
- // this.currentSample.insProduct = this.HaveJson(list)
- // this.currentNum++
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
+ this.currentNum++
}
}else {
this.$message.error(response.message);
@@ -3851,8 +3861,12 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(async () => {
+ this.loading = true
if(await this.$refs.CircuitParameters.saveAll()){
this.$emit('goback')
+ this.loading = false
+ }else{
+ this.loading = false
}
})
}else{
@@ -3863,7 +3877,9 @@
}
},
selectInsProductTemplate(){
- this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate).then(res => {
+ this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate,{
+ version:this.insOrder.sampleType=='鏃犳簮鍣ㄤ欢'?2:''
+ }).then(res => {
if (res.code == 201) return
this.templates = res.data
})
@@ -3873,7 +3889,7 @@
this.$axios.post(this.$api.insProductTemplate.getInsProductTemplate + '?id=' + e).then(res => {
if (res.code == 201) return
let obj = JSON.parse(res.data.message)
- if(this.currentTableState!=res.data.version){
+ if(this.currentTableState!=res.data.version&&this.insOrder.sampleType!='鏃犳簮鍣ㄤ欢'){
this.$message.error('鐢佃皟/闈炵數璋冩ā鏉跨増鏈笉涓�鑷达紝璇烽噸鏂伴�夋嫨')
this.template = null
return
@@ -3915,7 +3931,7 @@
this.templateLoading = true;
this.$axios.post(this.$api.insProductTemplate.addInsProductTemplate, {
name: this.templateName,
- version:this.currentTableState,
+ version:this.insOrder.sampleType=='鏃犳簮鍣ㄤ欢'?2:this.currentTableState,
message:JSON.stringify(obj)
}, {
headers: {
--
Gitblit v1.9.3