From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/site/AreaModel.vue | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/modules/site/AreaModel.vue b/src/views/eam/modules/site/AreaModel.vue
index 29c7aca..8f563eb 100644
--- a/src/views/eam/modules/site/AreaModel.vue
+++ b/src/views/eam/modules/site/AreaModel.vue
@@ -16,14 +16,14 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="杞﹂棿缂栧彿"
+ label="宸ュ尯缂栧彿"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
- :readOnly="disableSubmit"
+ :readOnly="true"
allow-clear
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�"
+ placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -33,20 +33,36 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="杞﹂棿鍚嶇О"
+ label="宸ュ尯鍚嶇О"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
:readOnly="disableSubmit"
allow-clear
- placeholder="璇疯緭鍏ヨ溅闂村悕绉�"
+ placeholder="璇疯緭鍏ュ伐鍖哄悕绉�"
v-decorator="['name', validatorRules.name ]"
/>
</a-form-item>
</a-col>
</a-row>
-
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="{span:4}"
+ :wrapperCol="{span:18}"
+ >
+ <j-multi-select-tag
+ :disabled="disableSubmit"
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ v-decorator="['teamId', validatorRules.teamId ]"
+ dictCode="mom_base_team,name,id,status!='0' and del_flag!='1' order by num asc"
+ >
+ </j-multi-select-tag>
+ </a-form-item>
+ </a-col>
+ </a-row>
<!-- <a-row :gutter="24">
<a-col :span="24">
<a-form-item
@@ -89,7 +105,7 @@
<script>
import pick from 'lodash.pick'
-import { postAction, requestPut } from '@/api/manage'
+import { getAction,postAction, requestPut } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
export default {
@@ -118,14 +134,14 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ溅闂寸紪鍙�!' },
+ { required: true, message: '璇疯緭鍏ュ伐鍖虹紪鍙�!' },
{ min: 0, max: 30, message: '闀垮害涓嶈秴杩� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
]
},
name: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ溅闂村悕绉�!' },
+ { required: true, message: '璇疯緭鍏ュ伐鍖哄悕绉�!' },
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateName },
]
@@ -143,7 +159,8 @@
},
url: {
add: "/base/area/add",
- edit: "/base/area/edit"
+ edit: "/base/area/edit",
+ getNum: '/eam/sysIdentity/getNumNew',
},
disableSubmit: false,
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
@@ -162,8 +179,17 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'num', 'name', 'deptId', 'remark'))
+ this.form.setFieldsValue(pick(this.model, 'num', 'name', 'teamId', 'deptId', 'remark'))
});
+ if (!record.id) {
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'Area', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
+ }
},
close() {
this.$emit('close');
--
Gitblit v1.9.3