From d4d65c814113e47b6dd61fe39dd0a09ec737bc10 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 26 五月 2024 23:05:38 +0800
Subject: [PATCH] 2024-5-24 需求小调整
---
src/components/view/custom_manage.vue | 30 ++++++++++++++++++++++++++++++
src/components/view/a6-personnel-detail.vue | 10 +++++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index 03c27c1..9ec2650 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -67,7 +67,7 @@
background-color: #fff;
height: 100%;
display: flex;
- align-items: center;
+ align-items: right;
justify-content: end;
}
@@ -170,6 +170,13 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2"/>
</div>
@@ -245,6 +252,7 @@
expandedKeys: [],
selectUserDia: false,
componentData2: {
+ name: null,
entity: {
orderBy: {
field: 'id',
diff --git a/src/components/view/custom_manage.vue b/src/components/view/custom_manage.vue
index 595ac5d..8dc0396 100644
--- a/src/components/view/custom_manage.vue
+++ b/src/components/view/custom_manage.vue
@@ -112,6 +112,13 @@
</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="15">
+ <el-input v-model="user.companyEn" size="small" clearable></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="15">
<el-input v-model="user.code" size="small" clearable></el-input>
@@ -125,6 +132,14 @@
: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="15">
+ <el-input type="textarea" v-model="user.addressEn" size="small" clearable
+ :autosize="{minRows: 2, maxRows: 4}"></el-input>
+ </el-col>
+ </el-row>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addDia = false">鍙� 娑�</el-button>
@@ -132,6 +147,13 @@
</span>
</el-dialog>
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="selectUserDia" width="70%">
+ <div class="search" style="height: 35px; margin-bottom: 9px;">
+ <div class="search_thing">
+ <div class="search_label">鐢ㄦ埛鍚嶏細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div>
+ </div>
+ </div>
<div class="body" style="height: 60vh;" v-if="selectUserDia">
<ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />
</div>
@@ -282,6 +304,14 @@
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
+ }
this.loading = true
this.$axios.post(this.$api.user.addCustom, this.user, {
headers: {
--
Gitblit v1.9.3