From 2193f1e8240e2a0ed5900dddc6347a1d9db081cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 14:38:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
platform/src/components/business/OperaCompanyUserWindow.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/platform/src/components/business/OperaCompanyUserWindow.vue b/platform/src/components/business/OperaCompanyUserWindow.vue
index 6613a25..45942e7 100644
--- a/platform/src/components/business/OperaCompanyUserWindow.vue
+++ b/platform/src/components/business/OperaCompanyUserWindow.vue
@@ -11,11 +11,11 @@
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ鎴蜂紒涓氬叏绉帮紝涓嶈秴杩�30瀛�" v-trim/>
浼佷笟鍚嶇О闇�涓庡伐鍟嗛儴闂ㄧ櫥璁颁俊鎭竴鑷�
</el-form-item>
- <el-form-item label="浼佷笟绠�绉�" prop="shortName">
+ <el-form-item label="瀹㈡埛绠�绉�" prop="shortName">
<el-input v-model="form.shortName" placeholder="璇疯緭鍏ヤ紒涓氱畝绉�" v-trim/>
</el-form-item>
- <el-form-item label="缁熶竴绀句細淇＄敤浠ｇ爜" prop="creditCode">
- <el-input v-model="form.creditCode" placeholder="璇疯緭鍏ョ粺涓�绀句細淇＄敤浠ｇ爜" v-trim/>
+ <el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="creditCode">
+ <el-input v-model="form.creditCode" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" v-trim/>
缁熶竴淇＄敤浠ｇ爜闇�涓庡伐鍟嗛儴闂ㄧ櫥璁颁俊鎭竴鑷�
</el-form-item>
<el-form-item label="鐧诲綍璐﹀彿" prop="managerUserName">
@@ -26,6 +26,7 @@
</el-form-item>
<el-form-item label="涓绘挱鏁伴噺闄愬埗" prop="userNum">
<el-input v-model="form.userNum" :disabled="!!this.form.id" placeholder="璇疯緭鍏ヤ富鎾暟閲忛檺鍒�" v-trim/>
+
</el-form-item>
<el-form-item label="閿�鍞汉鍛�" prop="salesmanId">
<!-- <el-input v-model="form.salesmanId" placeholder="璇疯緭鍏ラ攢鍞汉鍛樼紪鐮�" v-trim/> -->
@@ -71,7 +72,7 @@
linkname: '',
linkephone: '',
creditCode: '',
- userNum: '',
+ userNum: 5,
oepnValidDate: '',
salesmanId: ''
},
@@ -106,6 +107,7 @@
<style lang="scss" scoped>
.more {
margin-top: 40px;
+ margin-bottom: 10px;
.more-title {
font-weight: 600;
font-size: 18px;
--
Gitblit v1.9.3