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

+

{{ $store.state.user.agencyName }} diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 3baad809d..4ae414aa8 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -1,12 +1,11 @@ @@ -177,6 +192,7 @@ + @@ -1894,6 +1910,47 @@ export default { this.DisableForm.staffId = row.staffId; this.Disable = true; }, + enablestaff (row) { + this.$confirm("确认解禁该员工?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.submitEnable(row) + }) + .catch(err => { + if (err == "cancel") { + // this.$message({ + // type: "info", + // message: "已取消删除" + // }); + } + + }); + }, + // 确定解禁 + async submitEnable (row) { + const url = "/epmetuser/customerstaff/enablestaff"; + + let params = { + staffId: row.staffId, + + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.$message.success("解禁成功"); + this.Disable = false; + this.getAgencyList(); + this.getDepartmentList(); + this.getGridList(); + this.getAgencyStaffListData(); + } else { + this.$message.error(msg); + } + }, // 确定禁用 async submitDisable () { const url = "/epmetuser/customerstaff/disabledstaff"; diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 35da15bde..e47d6a7c9 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -169,8 +169,23 @@ :value="item.value"> - - + + + +

+
+ 至 - 删除
+
@@ -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/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index 0ebe2dc7c..220ca5264 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -2,24 +2,26 @@
- 新增 + 新增
-
+
-
-
+
+
- 修改 - 删除 + 修改 + 删除
{{ item.centerName }}
@@ -49,108 +51,93 @@ >
--> -
- - - - +
+ + + + - + + - +
-
- +
+
- - + + - - + + - - + +
@@ -168,7 +155,7 @@ var map; export default { components: { editForm, orderForm, orderList }, - data() { + data () { return { openSearch: false, @@ -185,7 +172,7 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.$store.state.inIframe ? this.clientHeight - 520 + 120 : this.clientHeight - 520; @@ -193,17 +180,17 @@ export default { ...mapGetters(["clientHeight"]), }, watch: { - currentIndex() { + currentIndex () { this.setMap(); }, }, - async mounted() { + async mounted () { await this.loadAgency(); await this.getTableData(); }, methods: { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap() { + initMap () { let { latitude, longitude } = this.$store.state.user; map = new daiMap( @@ -217,7 +204,7 @@ export default { ); }, - setMap() { + setMap () { const { tableData, currentIndex } = this; let item = tableData[currentIndex]; if (item) { @@ -226,24 +213,24 @@ export default { } }, - handleClose() { + handleClose () { this.formShow = false; }, - handleCloseForm2() { + handleCloseForm2 () { this.form2Show = false; }, - handleCloseOrderList() { + handleCloseOrderList () { this.orderListShow = false; }, - async handleAdd() { + async handleAdd () { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleWatch() { + async handleWatch () { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -252,7 +239,7 @@ export default { ); }, - async handleEdit() { + async handleEdit () { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm( @@ -261,12 +248,12 @@ export default { ); }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleOrder(index) { + async handleOrder (index) { this.form2Show = true; await nextTick(); this.$refs.eleOrderForm.initForm( @@ -276,18 +263,18 @@ export default { ); }, - handleOrderSuccess() { + handleOrderSuccess () { this.handleCloseForm2(); }, - async handleOrderList(index) { + async handleOrderList (index) { this.orderListShow = true; await nextTick(0); console.log(this.$refs); this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index); }, - async handleDel() { + async handleDel () { if (!confirm("删除后不可恢复，确定删除？")) return; const item = this.tableData[this.currentIndex]; @@ -303,7 +290,7 @@ export default { } }, - async getTableData() { + async getTableData () { const oldLen = this.tableData.length; const url = "/gov/org/icpartyservicecenter/partyservicecenterlist"; const { data, code, msg } = await requestPost(url, { @@ -312,6 +299,46 @@ export default { }); if (code === 0) { console.log("列表请求成功！！！！！！！！！！！！！！"); + data.forEach(tableItem => { + if (tableItem.matterList.length > 0) { + tableItem.matterList.forEach(element => { + if (element.appointmentType === 'custom') { + let showName = '' + let customList = element.customDay.split(',') + let customNameList = [] + + customList.forEach(customItem => { + if (customItem === '1') { + customNameList.push('周日') + } + if (customItem === '2') { + customNameList.push('周一') + } + if (customItem === '3') { + customNameList.push('周二') + } + if (customItem === '4') { + customNameList.push('周三') + } + if (customItem === '5') { + customNameList.push('周四') + } + if (customItem === '6') { + customNameList.push('周五') + } + if (customItem === '7') { + customNameList.push('周六') + } + }); + + showName = customNameList.join('、') + showName = showName + ' ' + element.startTime + '-' + element.endTime + element.showName = showName + } + + }); + } + }); this.tableData = data; @@ -324,7 +351,7 @@ export default { }, //加载组织 - async loadAgency() { + async loadAgency () { const url = "/epmetuser/customerstaff/staffbasicinfo"; let params = {}; 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||'--' }} - + - +
- + - +
- + - +