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/OperaCompanyWindow.vue | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/platform/src/components/business/OperaCompanyWindow.vue b/platform/src/components/business/OperaCompanyWindow.vue
index 4c91ee7..0739250 100644
--- a/platform/src/components/business/OperaCompanyWindow.vue
+++ b/platform/src/components/business/OperaCompanyWindow.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-input v-model="form.shortName" placeholder="璇疯緭鍏ヤ紒涓氱畝绉�" v-trim/>
+ <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/>
+ 杈撳叆0琛ㄧず涓嶉檺鍒�
</el-form-item>
<el-form-item label="閿�鍞汉鍛�" prop="salesmanId">
<!-- <el-input v-model="form.salesmanId" placeholder="璇疯緭鍏ラ攢鍞汉鍛樼紪鐮�" v-trim/> -->
@@ -54,6 +55,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import { findAllList } from '@/api/system/user'
+import { loginNameRule, creditCode } from '@/utils/form'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -71,7 +73,7 @@
linkname: '',
linkephone: '',
creditCode: '',
- userNum: '',
+ userNum: '5',
oepnValidDate: '',
salesmanId: ''
},
@@ -82,7 +84,10 @@
{ required: true, message: '璇疯緭鍏ュ鎴蜂紒涓氬叏绉�', tigger: 'blur'}
],
managerUserName: [
- { required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�', tigger: 'blur'}
+ { required: true, validator: loginNameRule, message: '璇疯緭鍏ョ櫥褰曡处鍙�', tigger: 'blur'}
+ ],
+ creditCode: [
+ { validator: creditCode, trigger: 'blur' }
],
openUserNum: [
{ pattern: /^[0-9]+$/, message: '鍙彲浠ヨ緭鍏ユ暟瀛�', trigger: 'change' }
@@ -99,16 +104,43 @@
.then(res => {
this.sales = res
})
- }
+ },
+ methods: {
+ open(title, target) {
+ this.title = title
+ this.visible = true
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ let data = new Date(new Date().getTime() + 31536000000)
+ this.form.oepnValidDate = `${data.getFullYear()}-${data.getMonth() +1}-${data.getDate()}`
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ this.form.multifileList.forEach(item => {
+ item.url = item.filefullurl
+ })
+ })
+ },
+ },
}
</script>
<style lang="scss" scoped>
.more {
margin-top: 40px;
+
.more-title {
font-weight: 600;
font-size: 18px;
+ margin-bottom: 10px;
}
}
::v-deep .el-input {
--
Gitblit v1.9.3