From 760d1a1f815d349832a36fac25b28abb51ff53d4 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 17:20:35 +0800
Subject: [PATCH] 1.检验任务提交之后的弹框,填写 试验信息只有在电路试验的站点才会进行填写,其余站点不需要
---
src/components/do/b1-ins-order/add.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 480367f..4e6f9cb 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -256,6 +256,13 @@
</el-select>
</div>
</el-col>
+ <el-col class="search_thing" :span="6" v-if="addObj.formType==='鍏朵粬鎴愬搧'">
+ <div class="search_label">闆朵欢鍙凤細</div>
+ <div class="search_input">
+ <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.partNo"
+ :readonly="active>1"></el-input>
+ </div>
+ </el-col>
<el-col class="search_thing" :span="6" v-if="addObj.formType!='鍏朵粬鎴愬搧'&&addObj.formType">
<div class="search_label"><span class="required-span">* </span>涓嬪彂鑷冲璞★細</div>
<div class="search_input">
@@ -301,7 +308,7 @@
<div class="search_input">
<!-- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
:readonly="active>1"></el-input> -->
- <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅">
+ <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅" :readonly="active>1">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=2"
:disabled="active>1"></el-button></template>
</el-input>
@@ -1006,7 +1013,8 @@
companyId: null,
prepareUser:null,
departmentLimsId:null,
- departmentLims:null
+ departmentLims:null,
+ partNo: null, // 闆朵欢鍙�
},
sample: {
sampleCode: null,
@@ -1559,7 +1567,12 @@
}
}else if(this.createState==2){
this.addObj.production = selects.company
- this.addObj.productionEn = selects.companyEn
+ // 濡傛灉閫夋嫨鐨勫崟浣嶆槸娌℃湁瀵瑰簲鐨勮嫳鏂囧悕绉板氨鐢�'/'浠ｆ浛
+ if (!selects.companyEn) {
+ this.addObj.productionEn = '/'
+ } else {
+ this.addObj.productionEn = selects.companyEn
+ }
}
this.selectUserDia = false
},
@@ -2631,11 +2644,11 @@
'Content-Type': 'application/json'
}
}).then(res => {
+ this.getProductLoad = false
res.data.forEach(a => {
a.state = 0
})
row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
this.$refs.sampleTable.setCurrentRow(row)
@@ -2644,6 +2657,8 @@
if (a.state == 1) this.toggleSelection(a)
})
}, 200)
+ }).catch(e => {
+ this.getProductLoad = false
})
this.searchProject()
this.searchTemList()
@@ -3234,7 +3249,7 @@
},
selectDepartmentEnum(){
this.$axios.get(this.$api.department.selectDepartmentLimsEnum).then(res=>{
- this.deaprtEnum = res.data
+ this.deaprtEnum = res.data.filter(item=>item.name === '璐ㄩ噺閮�' || item.name === '妫�娴嬩腑蹇�')
})
}
}
--
Gitblit v1.9.3