diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 075118bfe..4f3335917 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -6,7 +6,7 @@ :class="`aui-navbar--${$store.state.navbarLayoutType}`" >
-

+

{{ customerName }} diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 2672b6952..12346a8a6 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -2,7 +2,7 @@
@@ -261,6 +277,41 @@ export default { label: "周末", value: "weekend", }, + { + label: "自定义", + value: "custom", + }, + ], + customOption: [ + { + label: "周日", + value: "1", + }, + { + label: "周一", + value: "2", + }, + { + label: "周二", + value: "3", + }, + { + label: "周三", + value: "4", + }, + { + label: "周四", + value: "5", + }, + { + label: "周五", + value: "6", + }, + { + label: "周六", + value: "7", + }, + ], dataForm: { @@ -350,6 +401,8 @@ export default { matterImg: "", startTime: "", endTime: "", + customDay: "", + customList: [] }, ]; }, @@ -470,6 +523,15 @@ export default { this.dataForm = { ...this.dataForm, ...row }; this.partyServiceCenterId = this.dataForm.partyServiceCenterId; + this.dataForm.matterList.forEach(element => { + if (element.customDay) { + element.customList = element.customDay.split(',') + } else { + element.customList = [] + } + + }); + } else { this.dataForm.latitude = latitude this.dataForm.longitude = longitude @@ -491,7 +553,7 @@ export default { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; - }, 10000); + }, 5000); this.$refs["ref_form"].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj); @@ -516,14 +578,17 @@ export default { const matterList = this.dataForm.matterList.filter( (item) => !item.matterId ); + if ( + matterList.some( (item) => + !item.matterImg || !item.matterName || !item.appointmentType || !item.startTime || - !item.endTime + !item.endTime || (item.appointmentType === 'custom' && item.customList.length === 0) ) ) { return this.$message({ @@ -532,6 +597,12 @@ export default { }); } + matterList.forEach(element => { + element.customDay = element.customList.join(',') + }); + + + const { data, code, msg } = await requestPost(url, { ...this.dataForm, matterList, diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue index be802b46c..eade139ad 100644 --- a/src/views/modules/communityService/fuwujilu/detailForm.vue +++ b/src/views/modules/communityService/fuwujilu/detailForm.vue @@ -21,7 +21,7 @@
政策依据: - {{ formData.policyName||'--' }} + {{ formData.policyTitle||'--' }} - + - +
- + - +
- + - +