From 7606f6ab13d53a0c11c0980e456a6ccb4b346a98 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 九月 2024 15:27:14 +0800
Subject: [PATCH] 修改约定时间、电路试验d分辨率问题
---
src/components/do/b1-ins-order/add.vue | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 5ba2e10..a380c1e 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">
@@ -342,6 +349,17 @@
<div class="search_label">濮旀墭浜猴細</div>
<div class="search_input">
<el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-date-picker
+ v-model="addObj.appointed"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+ </el-date-picker>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -1006,7 +1024,9 @@
companyId: null,
prepareUser:null,
departmentLimsId:null,
- departmentLims:null
+ departmentLims:null,
+ partNo: null, // 闆朵欢鍙�
+ appointed:null,
},
sample: {
sampleCode: null,
@@ -1662,6 +1682,8 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸悕绉�')
} else if (!this.sampleList.every(m => m.model)) {
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
+ }else if (!this.addObj.appointed) {
+ this.$message.error('璇烽�夋嫨绾﹀畾鏃堕棿')
} else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else if(this.addObj.formType&&this.addObj.formType!='鍏朵粬鎴愬搧'&&!this.addObj.issueUser){
@@ -3241,7 +3263,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