From 9e34e3c4a5fce250614ac014ecc3e83f41d6f637 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:26:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 126481b..3157392 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -246,27 +246,27 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">宸ョ▼鍚嶇О锛�</div>
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇О锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value1" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">宸ョ▼鍚嶇ОEN锛�</div>
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇ОEN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value2" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">鐢熶骇鍗曚綅锛�</div>
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value3" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">鐢熶骇鍗曚綅EN锛�</div>
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value4" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -588,10 +588,10 @@
orderType: null,
send: 1,
formType: '閫佹',
- value1: null,
- value2: null,
- value3: null,
- value4: null,
+ engineering: null,
+ engineeringEn: null,
+ production: null,
+ productionEn: null,
},
sample: {
sampleCode: null,
@@ -755,6 +755,14 @@
this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
+ }else if (!this.addObj.engineering) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉�')
+ } else if (!this.addObj.engineeringEn) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉癊N')
+ }else if (!this.addObj.production) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
+ }else if (!this.addObj.productionEn) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
} else if (!this.sampleList.every(m => m.sample)) {
--
Gitblit v1.9.3