diff --git a/src/pages/policyRegulation/meeting/components/editDrawer.vue b/src/pages/policyRegulation/meeting/components/editDrawer.vue
index d0c1017a0..d16c095f8 100644
--- a/src/pages/policyRegulation/meeting/components/editDrawer.vue
+++ b/src/pages/policyRegulation/meeting/components/editDrawer.vue
@@ -276,7 +276,7 @@ export default {
}
},
watch: {
- editForm (val) {
+ showDrawer (val) {
if (this.title === '编辑') {
this.form = { ...this.editForm }
} else {
diff --git a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
index 0e8ba510a..46bceb634 100644
--- a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue
@@ -98,9 +98,9 @@
课题组会议
-
-
@@ -187,9 +187,9 @@
课题组联系方式
-
-
@@ -283,9 +283,9 @@
课题组联系方式
-
-
@@ -362,60 +362,59 @@ export default {
type: Object
}
},
- data (){
- const rules = {
+ data (){const rules = {
topicName: [
- {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {required: true, type: 'string', message: '课题名称不能为空', trigger: 'change'},
+ {type: 'string', max: 500, message: '课题名称不能超过500个字符', trigger: 'change'}
],
organizer: [
- {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'},
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {required: true, type: 'string', message: '课题承办单位不能为空', trigger: 'change'},
+ {type: 'string', max: 500, message: '课题承办单位不能超过500个字符', trigger: 'change'}
],
guidanceUnit: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '课题指导单位不能超过500个字符', trigger: 'change'}
],
participatingUnit: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '课题参与单位不能超过500个字符', trigger: 'change'}
],
startTime: [
- {required: true, message: '会议时间不能为空', trigger: 'change'}
+ {required: true, message: '启动时间不能为空', trigger: 'change'}
],
topicStatus: [
- {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'},
+ {required: true, type: 'string', message: '课题状态不能为空', trigger: 'change'},
],
topicCost: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '课题费用(万元)不能超过500个字符', trigger: 'change'}
],
meetingName: [
{type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
],
meetingTime: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '会议时间不能超过500个字符', trigger: 'change'}
],
meetingAddress: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change'}
],
participants: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '参会人员(内部)不能超过500个字符', trigger: 'change'}
],
meetingContent: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'}
],
name: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '姓名不能超过500个字符', trigger: 'change'}
],
department: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '单位不能超过500个字符', trigger: 'change'}
],
phone: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '电话不能超过500个字符', trigger: 'change'}
],
email: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '邮箱不能超过500个字符', trigger: 'change'}
],
identity: [
- {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'}
+ {type: 'string', max: 500, message: '身份不能超过500个字符', trigger: 'change'}
],
}
const form = {
@@ -495,7 +494,7 @@ export default {
}
},
watch: {
- editForm (val) {
+ showDrawer (val) {
if (this.title === '编辑') {
this.form = { ...this.editForm }
} else {
@@ -549,62 +548,39 @@ export default {
}
})
},
- addMeeting () {
- const meetingListItem = {
- meetingName: '',
- meetingTime: '',
- meetingAddress: '',
- participants: '',
- meetingContent: '',
+ add (type) {
+ let item = {}
+ switch (type) {
+ case 'meetingList':
+ item = {
+ meetingName: '',
+ meetingTime: '',
+ meetingAddress: '',
+ participants: '',
+ meetingContent: ''
+ }
+ break
+ case 'topicContactInformationList':
+ case 'insideContactInformationList':
+ item = {
+ name: '',
+ department: '',
+ phone: '',
+ email: '',
+ identity: ''
+ }
+ break
}
- this.form.meetingList = [...this.form.meetingList, meetingListItem]
+ this.form[type] = [...this.form[type], item]
},
- removeMeeting (index) {
+ remove (type, index) {
let res = []
- this.form.meetingList.forEach((item, i) => {
+ this.form[type].forEach((item, i) => {
if (i !== index) {
res.push(item)
}
})
- this.form.meetingList = [ ...res ]
- },
- addTopicContactInformation () {
- const topicContactInformationListItem = {
- name: '',
- department: '',
- phone: '',
- email: '',
- identity: ''
- }
- this.form.topicContactInformationList = [...this.form.topicContactInformationList, topicContactInformationListItem]
- },
- removeTopicContactInformation (index) {
- let res = []
- this.form.topicContactInformationList.forEach((item, i) => {
- if (i !== index) {
- res.push(item)
- }
- })
- this.form.topicContactInformationList = [ ...res ]
- },
- addInsideContactInformation () {
- const insideContactInformationListItem = {
- name: '',
- department: '',
- phone: '',
- email: '',
- identity: ''
- }
- this.form.insideContactInformationListItem = [...this.form.insideContactInformationListItem, insideContactInformationListItem]
- },
- removeInsideContactInformation (index) {
- let res = []
- this.form.insideContactInformationListItem.forEach((item, i) => {
- if (i !== index) {
- res.push(item)
- }
- })
- this.form.insideContactInformationListItem = [ ...res ]
+ this.form[type] = [ ...res ]
},
resetForm () {
this.form = this.initForm
diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/PersonInfo.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/PersonInfo.vue
index a499ea9b8..e5d7003f9 100644
--- a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/PersonInfo.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/PersonInfo.vue
@@ -39,7 +39,7 @@ export default {
type: Object
},
disabled: {
- type: Object,
+ type: Boolean,
default: false
}
},
diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue
index ab8dd2f2c..71e1b8023 100644
--- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue
@@ -6,7 +6,8 @@
+
{
+ this.$set(this, 'processData', res)
+ }, e => {})
+ }
+ },
//保存
handleSave() {
this.footerLoading = true
diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/PersonInfo.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/PersonInfo.vue
index 4379942e5..d1548073c 100644
--- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/PersonInfo.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/PersonInfo.vue
@@ -39,7 +39,7 @@ export default {
type: Object
},
disabled: {
- type: Object,
+ type: Boolean,
default: false
}
},