From 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 17:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/view/custom_manage.vue | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/components/view/custom_manage.vue b/src/components/view/custom_manage.vue
index 43b9596..f323754 100644
--- a/src/components/view/custom_manage.vue
+++ b/src/components/view/custom_manage.vue
@@ -40,7 +40,7 @@
<div class="custom_manage">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">瀹㈡埛绠＄悊</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">瀹㈡埛绠＄悊</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="addDia = true" v-if="addPower">鏂板</el-button>
</el-col>
@@ -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>
@@ -247,6 +242,7 @@
}
},
selectField: {},
+ needSort: ['company'],
}
}
},
@@ -264,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