diff --git a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
index a471eabf..7d7c0f95 100644
--- a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
+++ b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
@@ -195,6 +195,11 @@ export default {
this.$message.warning(this.$t('businessSupport.standardizationActivity.pleaseSelectNode'))
return
}
+ // 只能加四级
+ if (this.selectedNode.level + '' === '3') {
+ this.$message.warning(this.$t('businessSupport.standardizationActivity.addUpToFourLevels'))
+ return
+ }
this.$refs.modalForm.add({ pid: this.selectedNodeId, pName: this.selectedNode.name, level: this.selectedNode.level + 1 })
},
handleEdit () {
diff --git a/src/views/businessSupport/standardizationActivity/modules/ContactModal.vue b/src/views/businessSupport/standardizationActivity/modules/ContactModal.vue
index 2ca207dd..8f98c451 100644
--- a/src/views/businessSupport/standardizationActivity/modules/ContactModal.vue
+++ b/src/views/businessSupport/standardizationActivity/modules/ContactModal.vue
@@ -123,7 +123,7 @@ export default {
handleOk () {
this.form.validateFields((errors, values) => {
if (!errors) {
- const formData = Object.assign({}, values)
+ const formData = Object.assign(this.model, values)
this.$emit('ok', formData)
this.close()
}
diff --git a/src/views/businessSupport/standardizationActivity/modules/GroupModal.vue b/src/views/businessSupport/standardizationActivity/modules/GroupModal.vue
index 1c9b2aa5..ac4c817e 100644
--- a/src/views/businessSupport/standardizationActivity/modules/GroupModal.vue
+++ b/src/views/businessSupport/standardizationActivity/modules/GroupModal.vue
@@ -25,8 +25,9 @@
:label="$t('businessSupport.standardizationActivity.ourPersonnel')">
+ v-decorator="['personnelId', validatorRules.personnelId]"
+ @listChange="handleUserChange"
+ @nameChange="handleUserNameChange" />
event.target.value = event.target.value.trim()"
:maxLength="50"
+ disabled
v-decorator="['department', validatorRules.department]" />
@@ -63,6 +65,7 @@
event.target.value = event.target.value.trim()"
:maxLength="50"
+ disabled
v-decorator="['phone', validatorRules.phone]" />
@@ -72,6 +75,7 @@
event.target.value = event.target.value.trim()"
:maxLength="50"
+ disabled
v-decorator="['mailbox', validatorRules.mailbox]" />
@@ -117,8 +121,11 @@ export default {
validateTrigger: 'blur'
},
// 我司人员
- personnel: {
- rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('businessSupport.standardizationActivity.ourPersonnel') }],
+ personnelId: {
+ rules: [{
+ required: true,
+ message: this.$t('pleaseEnter') + this.$t('businessSupport.standardizationActivity.ourPersonnel')
+ }],
validateTrigger: 'change'
},
// 工号
@@ -164,7 +171,7 @@ export default {
handleOk () {
this.form.validateFields((errors, values) => {
if (!errors) {
- const formData = Object.assign({}, values)
+ const formData = Object.assign(this.model, values)
this.$emit('ok', formData)
this.close()
}
@@ -182,10 +189,15 @@ export default {
const data = list[0] || {}
const obj = {
jobNum: data.username, // 工号
- mailbox: data.email // 邮箱
+ mailbox: data.email, // 邮箱
+ department: data.orgCodeTxt, // 部门
+ phone: data.phone // 电话
}
this.form.setFieldsValue(obj)
},
+ handleUserNameChange (name) {
+ this.model.personnel = name
+ },
/**
* 校验电话
* @param rule
@@ -221,6 +233,12 @@ export default {
return
}
callback(this.$t('user.enterMailboxCorrect'))
+ },
+ handleDepartChange (departInfo) {
+ const names = departInfo.map(tt => {
+ return tt.text
+ })
+ this.model.department_dictText = names.join(',')
}
}
}
diff --git a/src/views/businessSupport/standardizationActivity/modules/MeetingModal.vue b/src/views/businessSupport/standardizationActivity/modules/MeetingModal.vue
index a442b631..0ffb8a9e 100644
--- a/src/views/businessSupport/standardizationActivity/modules/MeetingModal.vue
+++ b/src/views/businessSupport/standardizationActivity/modules/MeetingModal.vue
@@ -33,7 +33,7 @@
:wrapperCol="wrapperCol"
:label="$t('workCenter.enStandardRevision.conferee')">
+ v-decorator="['personnelId', validatorRules.personnelId]" @nameChange="handleUserNameChange"/>
@@ -79,7 +79,7 @@ export default {
validateTrigger: 'blur'
},
// 参会人员
- personnel: {
+ personnelId: {
rules: [{
required: true,
message: this.$t('pleaseSelect') + this.$t('workCenter.enStandardRevision.conferee')
@@ -104,7 +104,7 @@ export default {
handleOk () {
this.form.validateFields((errors, values) => {
if (!errors) {
- const formData = Object.assign({}, values)
+ const formData = Object.assign(this.model, values)
this.$emit('ok', formData)
this.close()
}
@@ -117,6 +117,9 @@ export default {
this.visible = false
this.model = {}
this.form.resetFields()
+ },
+ handleUserNameChange (name) {
+ this.model.personnel = name
}
}
}
diff --git a/src/views/businessSupport/standardizationActivity/modules/PaymentModal.vue b/src/views/businessSupport/standardizationActivity/modules/PaymentModal.vue
index 9043a5f3..efe2b419 100644
--- a/src/views/businessSupport/standardizationActivity/modules/PaymentModal.vue
+++ b/src/views/businessSupport/standardizationActivity/modules/PaymentModal.vue
@@ -26,7 +26,7 @@
+ v-decorator="['year', validatorRules.year]" />
+ dictCode="pay_state"
+ @change="handleStateChange" />