From 9e1010ee4db8d79a5977d097befddbe6e673492a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 24 Nov 2022 14:33:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/rent/rentcontractinfo.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index b687f7d07..4ee321e33 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -101,30 +101,30 @@ - + - +
- + - +
- + - + Date: Fri, 25 Nov 2022 14:29:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89home=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main-navbar.vue | 2 +- src/views/main-shuju/main-navbar.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: [] }, ]; }, @@ -491,7 +544,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 +569,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 +588,12 @@ export default { }); } + matterList.forEach(element => { + element.customDay = element.customList.join(',') + }); + + + const { data, code, msg } = await requestPost(url, { ...this.dataForm, matterList, From d004cf2ef709b37b7b4c1b92db407a1d84bfac95 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 29 Nov 2022 09:37:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E4=BE=9D=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityService/dqfwzx/cpts/edit.vue | 9 +++++++++ .../modules/communityService/fuwujilu/detailForm.vue | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index adfcf3fad..e47d6a7c9 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -523,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 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||'--' }}