From 0762e093d412ae2f2e7f02a2b9e1774c67de8564 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 15:21:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/do/b1-ins-order/add.vue | 14 ++++++
src/components/view/custom_manage.vue | 57 +++++++++++++---------------
2 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 56e3099..cde0041 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.engineering"
+ :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">
@@ -1559,7 +1566,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
},
diff --git a/src/components/view/custom_manage.vue b/src/components/view/custom_manage.vue
index d9cc053..f323754 100644
--- a/src/components/view/custom_manage.vue
+++ b/src/components/view/custom_manage.vue
@@ -71,31 +71,27 @@
</el-col>
</el-row>
<el-row style="line-height: 50px;">
- <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
- </span>瀹㈡埛鍗曚綅EN锛�</el-col>
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">瀹㈡埛鍗曚綅EN锛�</el-col>
<el-col :span="15">
<el-input v-model="user.companyEn" size="small" clearable></el-input>
</el-col>
</el-row>
<el-row style="margin-top: 15px;">
- <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
- </span>鍗曚綅鍦板潃锛�</el-col>
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">鍗曚綅鍦板潃锛�</el-col>
<el-col :span="15">
<el-input type="textarea" v-model="user.address" size="small" clearable
:autosize="{minRows: 2, maxRows: 4}"></el-input>
</el-col>
</el-row>
<el-row style="margin-top: 15px;">
- <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
- </span>瀹㈡埛鍦板潃EN锛�</el-col>
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">瀹㈡埛鍦板潃EN锛�</el-col>
<el-col :span="15">
<el-input type="textarea" v-model="user.addressEn" size="small" clearable
:autosize="{minRows: 2, maxRows: 4}"></el-input>
</el-col>
</el-row>
<el-row style="line-height: 50px;">
- <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
- </span>鍔犳�ラ搴︼細</el-col>
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">鍔犳�ラ搴︼細</el-col>
<el-col :span="15">
<el-input v-model="user.num" size="small" clearable></el-input>
</el-col>
@@ -113,8 +109,7 @@
</el-col>
</el-row>
<el-row style="line-height: 50px;">
- <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
- </span>瀹㈡埛缂栧彿锛�</el-col>
+ <el-col :span="7" style="text-align: right;padding-right: 8px;">瀹㈡埛缂栧彿锛�</el-col>
<el-col :span="15">
<el-input v-model="user.code2" size="small" clearable></el-input>
</el-col>
@@ -265,29 +260,29 @@
},
customAdd() {
if (this.user.company == '' || this.user.company == null) {
- this.$message.error('璇峰～鍐欏鎴峰崟浣�')
+ this.$message.error('璇峰～鍐欏鎴峰悕绉�')
return
}
- if (this.user.address == '' || this.user.address == null) {
- this.$message.error('璇峰～鍐欏崟浣嶅湴鍧�')
- return
- }
- if (this.user.companyEn == '' || this.user.companyEn == null) {
- this.$message.error('璇峰～鍐欒嫳鏂囧鎴峰崟浣�')
- return
- }
- if (this.user.addressEn == '' || this.user.addressEn == null) {
- this.$message.error('璇峰～鍐欒嫳鏂囧崟浣嶅湴鍧�')
- return
- }
- if (this.user.code2 == '' || this.user.code2 == null) {
- this.$message.error('璇峰～鍐欏鎴风紪鍙�')
- return
- }
- if (this.user.code2 == '' || this.user.code2 == null) {
- this.$message.error('璇峰～鍐欏姞鎬ラ搴�')
- return
- }
+ // if (this.user.address == '' || this.user.address == null) {
+ // this.$message.error('璇峰～鍐欏崟浣嶅湴鍧�')
+ // return
+ // }
+ // if (this.user.companyEn == '' || this.user.companyEn == null) {
+ // this.$message.error('璇峰～鍐欒嫳鏂囧鎴峰崟浣�')
+ // return
+ // }
+ // if (this.user.addressEn == '' || this.user.addressEn == null) {
+ // this.$message.error('璇峰～鍐欒嫳鏂囧崟浣嶅湴鍧�')
+ // return
+ // }
+ // if (this.user.code2 == '' || this.user.code2 == null) {
+ // this.$message.error('璇峰～鍐欏鎴风紪鍙�')
+ // return
+ // }
+ // if (this.user.code2 == '' || this.user.code2 == null) {
+ // this.$message.error('璇峰～鍐欏姞鎬ラ搴�')
+ // return
+ // }
this.loading = true
this.$axios.post(this.$api.user.addCustom, this.user, {
headers: {
--
Gitblit v1.9.3