From cef9b23e12937467b90ec4e598b122675d878a0e Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Fri, 25 Mar 2022 11:15:29 +0800 Subject: [PATCH] zx --- src/router/payment.js | 8 +++ .../Basic/Authority/depend/permissions.vue | 4 +- src/views/Basic/Authority/index.vue | 4 ++ src/views/Basic/Employee/depend/form.vue | 18 +++-- src/views/Basic/Employee/index.vue | 6 +- .../_houseHoldAudit/depend/config.js | 10 +-- .../EstateInfo/_houseHoldAudit/index.vue | 15 ++-- .../_houseHoldInfo/depend/addForm.vue | 6 +- .../_houseHoldInfo/depend/config.js | 21 ++++++ .../Basic/EstateInfo/_houseHoldInfo/index.vue | 19 +++++ src/views/Basic/WorkOrder/finishDrawer.vue | 2 +- .../Activity/_activityManage/depend/config.js | 24 +++---- .../_activityManage/depend/detail.vue | 72 ++++++++++++------- .../Activity/_organizers/depend/form.js | 21 ++++-- .../Activity/_organizers/depend/form.vue | 2 +- .../Operation/BBS/_topic/depend/config.js | 6 +- src/views/Operation/BBS/_topic/index.vue | 2 +- .../News/_newsManage/depend/config.js | 10 +-- .../News/_newsManage/depend/form.vue | 2 - .../Operation/News/_newsManage/index.vue | 1 - .../Operation/clientSet/depend/table.vue | 7 +- src/views/Operation/clientSet/index.vue | 4 +- .../BillManage/_payInfo/depend/config.js | 30 ++++++++ .../Payment/BillManage/_payInfo/index.vue | 33 +++++++++ .../ChargeStandardManage/depend/config.js | 30 ++++++++ .../Shop/GoodsManage/_jcookList/index.vue | 7 +- src/views/Shop/ScoreSetting/index.vue | 43 ++++++----- vue.config.js | 1 + 28 files changed, 309 insertions(+), 99 deletions(-) create mode 100644 src/views/Payment/BillManage/_payInfo/depend/config.js create mode 100644 src/views/Payment/BillManage/_payInfo/index.vue diff --git a/src/router/payment.js b/src/router/payment.js index 40a9112..3668fb7 100644 --- a/src/router/payment.js +++ b/src/router/payment.js @@ -53,6 +53,14 @@ export default [ redirect: '/Payment/ActivityManage', meta: {title: '账单管理'}, children: [ + { + path: '/BillManage/PayInfo', + name: "PayInfo", + title: "账单明细", + hide: false, + component: resolve => require(['@/views/Payment/BillManage/_payInfo'], resolve), + meta: {title: '账单明细'}, + }, { path: '/BillManage/PayList', name: "PayList", diff --git a/src/views/Basic/Authority/depend/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue index 3e0f8fd..21d969c 100644 --- a/src/views/Basic/Authority/depend/permissions.vue +++ b/src/views/Basic/Authority/depend/permissions.vue @@ -31,7 +31,7 @@ class="tree" v-model="checkedKeys" checkable - checkStrictly + :defaultExpandAll="true" :replace-fields="replaceFields" :expanded-keys="expandedKeys" :selected-keys="selectedKeys" @@ -108,6 +108,7 @@ export default { this.roleId = data; FindAllMenus({ roleId: this.roleId }).then((res) => { this.menus = res.data; + console.log(res.data) this.defaultCheck(this.menus); }); } else if (data === undefined) { @@ -138,6 +139,7 @@ export default { this.checkedKeys.push(item.id); } } + console.log(this.checkedKeys) }, onExpand(expandedKeys) { this.expandedKeys = expandedKeys; diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue index 606aeb8..e7461df 100644 --- a/src/views/Basic/Authority/index.vue +++ b/src/views/Basic/Authority/index.vue @@ -227,6 +227,7 @@ export default { }, success() { this.getData(); + this.getPeople(); }, addClose() { this.add.show = false; @@ -328,6 +329,9 @@ export default { // this.form.roleId = arr.toString() // }, async sendSubmit() { + if(this.form.roleId == ''){ + this.form.roleId = null + }; const res = await assignRoles(this.form); if (res.code === 200) { this.$message.success(res.msg); diff --git a/src/views/Basic/Employee/depend/form.vue b/src/views/Basic/Employee/depend/form.vue index e061194..1d54f58 100644 --- a/src/views/Basic/Employee/depend/form.vue +++ b/src/views/Basic/Employee/depend/form.vue @@ -9,7 +9,7 @@ :rules="rules" :wrapper-col="{ span: 18 }" > -
基本信息
+
基本信息
@@ -92,7 +92,7 @@ >单张最多不超过4M，最多上传2张，支持JPG,PNG格式 -
入职信息
+
入职信息
@@ -141,7 +141,7 @@ 支持上传PNG，JPG，PDF文件 -
联系信息
+
联系信息
@@ -172,7 +172,7 @@ -
其他信息
+
其他信息
@@ -470,3 +470,13 @@ export default { }; + \ No newline at end of file diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index a091ddb..9372fbf 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -3,12 +3,12 @@ - + /> -->
+ 新建分组
- + 查 询 重 置 diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js b/src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js index 73866e5..3990822 100644 --- a/src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js +++ b/src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js @@ -6,12 +6,12 @@ export const columns = [ { title: "申请人姓名", dataIndex:"name", - width:'14%' + width:'12%' }, { title: "申请人身份", key: "tags", - width: "14%", + width: "12%", dataIndex: "identity", scopedSlots: { customRender: "tags" }, }, @@ -24,7 +24,7 @@ export const columns = [ { title: "申请人手机号", dataIndex:"tel", - width:'14%' + width:'10%' }, { title: "申请人身份证号", @@ -34,7 +34,7 @@ export const columns = [ { title: "状态", dataIndex:"status", - width:'14%', + width:'10%', customRender:function(status){ switch (status) { case 1: @@ -51,7 +51,7 @@ export const columns = [ { title: "房屋类型", dataIndex:"estateTypeName", - width:'14%' + width:'10%' }, { title: "操作", diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue index 6105531..5fbab3b 100644 --- a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue @@ -57,7 +57,6 @@ :columns="columns" :data-source="tableData" :pagination="pagination" - :scroll="{ x: 1400 }" @change="handleTableChange" :row-selection="{ selectedRowKeys: selectedRowKeys, @@ -139,7 +138,10 @@ export default { // 选择的index selectedRowKeys: [], tableData: [], - ActionsList: [], + ActionsList: [ + { value: 1, label: '批量通过'}, + { value: 2, label: '批量驳回'} + ], activeName:'1', options:{ identity:[ @@ -202,11 +204,16 @@ export default { }, handleTableChange:handleTableChange, Actions(data) { - console.log(data); + this.selectedRowKeys.forEach(ele => { + let obj = {operate: data, estateReviewId: ele}; + review(obj); + this.$message.success('操作成功') + }) this.activeAction = undefined; + this.selectedRowKeys = []; + this.getData(); }, selectionChoosed(data) { - console.log(data); this.selectedRowKeys = data; }, reset: reset, diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue index 5e19d18..48f3052 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue @@ -121,12 +121,12 @@
-
+
关联信息
- +
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js index e9a81bc..5d43cfc 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js @@ -6,14 +6,35 @@ export const columns = [ { title: "住户姓名", dataIndex: "name", + width: 100 }, { title: "住户手机号", dataIndex: "tel", + width: 160 + }, + { + title: "居住房屋", + dataIndex: "build", + scopedSlots: { customRender: "build" }, + width: 380 + }, + { + title: "住户身份", + dataIndex: "ids", + width: 120, + scopedSlots: { customRender: "ids" }, + }, + { + title: "房屋类型", + dataIndex: "type", + width: 120, + scopedSlots: { customRender: "type" }, }, { title: "住户性别", dataIndex: "sex", + width: 120, customRender:function(sex){ switch (sex) { case 1: diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue index 48f104c..7f47954 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue @@ -46,6 +46,21 @@ } " > + +
+ {{item.manageBuildingName}}-{{item.manageUnitName}}-{{item.floorLocation}}-{{item.manageEstateName}} +
+ + + + {{item.identity==3?'租户':1?'业主':2?'业主亲属':'租户亲属'}} + + + +
+ {{item.manageEstateTypeName}} +
+ 房屋管理 @@ -431,6 +446,10 @@ export default { this.inform.estateId = undefined; } }, + //切换居住房屋 + handlerBuilding(index) { + console.log(index); + } }, computed: { // 是否选择selection diff --git a/src/views/Basic/WorkOrder/finishDrawer.vue b/src/views/Basic/WorkOrder/finishDrawer.vue index 6d9f3ac..f2beb4b 100644 --- a/src/views/Basic/WorkOrder/finishDrawer.vue +++ b/src/views/Basic/WorkOrder/finishDrawer.vue @@ -60,7 +60,7 @@ 总费用：{{total}} - 添加 + 添加费用
diff --git a/src/views/Operation/Activity/_activityManage/depend/config.js b/src/views/Operation/Activity/_activityManage/depend/config.js index e4ac78c..81dd232 100644 --- a/src/views/Operation/Activity/_activityManage/depend/config.js +++ b/src/views/Operation/Activity/_activityManage/depend/config.js @@ -4,7 +4,7 @@ export const formItem = [ type: 'select', label:'状态', prop:'status', - option:[{ id:1,name:'报名未开始'},{ id:2,name:'报名进行中'},{ id:3,name:'活动未开始'},{ id:4,name:'活动进行中'},{ id:5,name:'活动已结束'}], + option:[{id: null,name:'全部'},{ id:1,name:'报名未开始'},{ id:2,name:'报名进行中'},{ id:3,name:'活动未开始'},{ id:4,name:'活动进行中'},{ id:5,name:'活动已结束'}], placeholder:'请选择状态' }, { @@ -33,30 +33,30 @@ export const formItem = [ prop:'organizerName', placeholder:'请输入' }, - { - type: 'input', - label:'活动联系人', - prop:'activityContact', - placeholder:'请输入' - }, + // { + // type: 'input', + // label:'活动联系人', + // prop:'activityContact', + // placeholder:'请输入' + // }, ] export const columns = [ { title: "发布时间", dataIndex: "createDate", - width: "12%", + width: "10%", }, { title: "图片", dataIndex: "imgpic", - width: "10%", + width: "5%", scopedSlots: { customRender: "imgpic"} }, { title: "活动状态", dataIndex: "status", - width: "6%", + width: "5%", customRender: function (status) { switch (status) { case 1: @@ -112,14 +112,14 @@ export const columns = [ }, { title: "报名时间", - width: "12%", + width: "14%", customRender: function (data) { return (data.registrationStartTime + '——' + data.registrationEndTime) } }, { title: "活动时间", - width: "12%", + width: "14%", customRender: function (data) { return (data.activityStartTime + '——' + data.activityEndTime) } diff --git a/src/views/Operation/Activity/_activityManage/depend/detail.vue b/src/views/Operation/Activity/_activityManage/depend/detail.vue index de6fcae..77ca6b7 100644 --- a/src/views/Operation/Activity/_activityManage/depend/detail.vue +++ b/src/views/Operation/Activity/_activityManage/depend/detail.vue @@ -1,18 +1,26 @@