diff --git a/src/views/Basic/WorkOrder/index.vue b/src/views/Basic/WorkOrder/index.vue index 7369bd8..effbc10 100644 --- a/src/views/Basic/WorkOrder/index.vue +++ b/src/views/Basic/WorkOrder/index.vue @@ -13,8 +13,8 @@ 待支付 已完成 已评价 - 已拒绝 - 已取消 + + 已取消 @@ -110,7 +110,7 @@ {{ tag === 1 ? "待分配" : tag === 2 ? "工单池" :tag === 3 ? "已接单" :tag === 4 ? "处理中" :tag === 5 ? "待确认" :tag === 6 ? "待支付" - :tag === 7 ? "已完成" :tag === 8 ? "已评价" :tag === 9 ? "已拒绝" :tag === 10 ? "已取消" :'-' }} + :tag === 7 ? "已完成" :tag === 8 ? "已评价" :tag === 9 ? "已取消" :tag === 10 ? "已取消" :'-' }} @@ -478,7 +478,7 @@ export default { repShow: false, repData: [], repForm: {workOrderId: undefined, content: '', imgUrls: []}, - repStatus: ['','待分配','工单池','已接单','处理中','待确认','待支付','已完成','已评价','已拒绝','已取消'], + repStatus: ['','待分配','工单池','已接单','处理中','待确认','待支付','已完成','已评价','已取消','已取消'], //详情抽屉 detailData: { workOrderCostList: [], diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue index 54aa8f1..f6cc7db 100644 --- a/src/views/Layout/index.vue +++ b/src/views/Layout/index.vue @@ -1,7 +1,7 @@ @@ -111,12 +111,12 @@   我已同意《用户协议》 - 忘记密码忘记密码    免费注册 + > --> diff --git a/src/views/Payment/ChargeStandardManage/depend/form.vue b/src/views/Payment/ChargeStandardManage/depend/form.vue index 4994828..50fbf68 100644 --- a/src/views/Payment/ChargeStandardManage/depend/form.vue +++ b/src/views/Payment/ChargeStandardManage/depend/form.vue @@ -189,10 +189,10 @@ - +
- +
{ + if (list.childList) { + list.id = undefined; + deleteIds(list.childList); + } else { + return; + } + }); +} export default { name: 'addBillDrawer', props: { @@ -63,9 +74,6 @@ export default { }, immediate: true, }, - checkedKeys(val) { - this.form.estateIds = val.checked; - }, }, mounted() { this.getApi() @@ -93,7 +101,11 @@ export default { {title: "费用名称", dataIndex: "name"}, {title: "计费方式", dataIndex: "billingType"}, {title: "计量方式", dataIndex: "calculateType"}, - {title: "计量单价", dataIndex: "calculateUnit"}, + {title: "计量单价", dataIndex: "calculateUnit", + customRender: function (calculateUnit) { + return (calculateUnit*1).toFixed(2) + }, + }, {title: "备注", dataIndex: "remarks"}, ], selTime: [] @@ -103,13 +115,14 @@ export default { getApi() { findEstateCascade().then(res => { let data = res.data; - data.forEach(ele => { - ele.childList.forEach(el => { - el.checkable = false - }); - ele.checkable = false - }) + // data.forEach(ele => { + // ele.childList.forEach(el => { + // el.checkable = false + // }); + // ele.checkable = false + // }) this.roomTreeData = data + deleteIds(this.roomTreeData); }); chargesList({pageNum: 1,size: 1000}).then(res => { let data = res.data.rows; @@ -120,7 +133,13 @@ export default { this.$emit("onClose"); }, onCheck(checkedKeys) { - this.checkedKeys = checkedKeys.checked; + let ids = []; + for (let id of checkedKeys) { + if (typeof id == "number") { + ids.push(id); + } + } + this.form.estateIds = ids; }, //收费标准 selectionChoosed(data) { diff --git a/src/views/Payment/PayPlan/autoBillDrawer.vue b/src/views/Payment/PayPlan/autoBillDrawer.vue index 7fac4f1..23602e6 100644 --- a/src/views/Payment/PayPlan/autoBillDrawer.vue +++ b/src/views/Payment/PayPlan/autoBillDrawer.vue @@ -3,14 +3,14 @@
- +
{ + if (list.childList) { + list.id = undefined; + deleteIds(list.childList); + } else { + return; + } + }); +} export default { name: 'addBillDrawer', props: { @@ -88,10 +99,7 @@ export default { this.isVisibleDrawer = newValue; }, immediate: true, - }, - checkedKeys(val) { - this.form.estateIds = val.checked; - }, + } }, mounted() { this.getApi() @@ -120,10 +128,14 @@ export default { //收费标准 tableData: [], columns: [ - {title: "费用名称", dataIndex: "name",width: 100}, - {title: "计费方式", dataIndex: "billingType",width: 100}, - {title: "计量方式", dataIndex: "calculateType",width: 100}, - {title: "计量单价", dataIndex: "calculateUnit",width: 100}, + {title: "费用名称", dataIndex: "name"}, + {title: "计费方式", dataIndex: "billingType"}, + {title: "计量方式", dataIndex: "calculateType"}, + {title: "计量单价", dataIndex: "calculateUnit", + customRender: function (calculateUnit) { + return (calculateUnit*1).toFixed(2) + }, + }, {title: "备注", dataIndex: "remarks"}, ], selTime: [] @@ -133,13 +145,14 @@ export default { getApi() { findEstateCascade().then(res => { let data = res.data; - data.forEach(ele => { - ele.childList.forEach(el => { - el.checkable = false - }); - ele.checkable = false - }) + // data.forEach(ele => { + // ele.childList.forEach(el => { + // el.checkable = false + // }); + // ele.checkable = false + // }) this.roomTreeData = data + deleteIds(this.roomTreeData); }); chargesList({pageNum: 1,size: 1000}).then(res => { let data = res.data.rows; @@ -150,7 +163,13 @@ export default { this.$emit("onClose"); }, onCheck(checkedKeys) { - this.checkedKeys = checkedKeys.checked; + let ids = []; + for (let id of checkedKeys) { + if (typeof id == "number") { + ids.push(id); + } + } + this.form.estateIds = ids; }, //收费标准 selectionChoosed(data) { diff --git a/src/views/Payment/PayPlan/autoBillPaymentDrawer.vue b/src/views/Payment/PayPlan/autoBillPaymentDrawer.vue index 4158b0e..3a036a7 100644 --- a/src/views/Payment/PayPlan/autoBillPaymentDrawer.vue +++ b/src/views/Payment/PayPlan/autoBillPaymentDrawer.vue @@ -3,8 +3,8 @@
- +
{ + if (list.childList) { + list.id = undefined; + deleteIds(list.childList); + } else { + return; + } + }); +} export default { name: 'addBillDrawer', props: { @@ -88,10 +99,7 @@ export default { this.isVisibleDrawer = newValue; }, immediate: true, - }, - checkedKeys(val) { - this.form.estateIds = val.checked; - }, + } }, mounted() { this.getApi() @@ -120,10 +128,14 @@ export default { //收费标准 tableData: [], columns: [ - {title: "费用名称", dataIndex: "name",width: 100}, - {title: "计费方式", dataIndex: "billingType",width: 100}, - {title: "计量方式", dataIndex: "calculateType",width: 100}, - {title: "计量单价", dataIndex: "calculateUnit",width: 100}, + {title: "费用名称", dataIndex: "name"}, + {title: "计费方式", dataIndex: "billingType"}, + {title: "计量方式", dataIndex: "calculateType"}, + {title: "计量单价", dataIndex: "calculateUnit", + customRender: function (calculateUnit) { + return (calculateUnit*1).toFixed(2) + }, + }, {title: "备注", dataIndex: "remarks"}, ], selTime: [] @@ -133,13 +145,14 @@ export default { getApi() { findEstateCascade().then(res => { let data = res.data; - data.forEach(ele => { - ele.childList.forEach(el => { - el.checkable = false - }); - ele.checkable = false - }) + // data.forEach(ele => { + // ele.childList.forEach(el => { + // el.checkable = false + // }); + // ele.checkable = false + // }) this.roomTreeData = data + deleteIds(this.roomTreeData); }); chargesList({pageNum: 1,size: 1000}).then(res => { let data = res.data.rows; @@ -150,7 +163,13 @@ export default { this.$emit("onClose"); }, onCheck(checkedKeys) { - this.checkedKeys = checkedKeys.checked; + let ids = []; + for (let id of checkedKeys) { + if (typeof id == "number") { + ids.push(id); + } + } + this.form.estateIds = ids; }, //收费标准 selectionChoosed(data) { diff --git a/src/views/Payment/PayPlan/index.vue b/src/views/Payment/PayPlan/index.vue index 3eb60bb..a5efe37 100644 --- a/src/views/Payment/PayPlan/index.vue +++ b/src/views/Payment/PayPlan/index.vue @@ -45,8 +45,8 @@
选择房屋
- +
@@ -127,6 +127,17 @@ import {billAutoList, getAutoDeductionBills} from "@/api/payment/payPlan" //查 import {deleteAutoGenerateBills, deleteAutoDeductionBills} from "@/api/payment/payPlan" //删 import {updateAutoGenerateBills, updateAutoDeductionBills} from "@/api/payment/payPlan" //改 import {findByIdByBillAutoId, findById} from "@/api/payment/payPlan" //回调 +function deleteIds(lists) { + // 楼栋id和房屋id有重复，导致数形控件选择不可用，把除房屋id外的全改为undefined + lists.forEach((list) => { + if (list.childList) { + list.id = undefined; + deleteIds(list.childList); + } else { + return; + } + }); +} export default { name: 'payPlay', components: { @@ -134,11 +145,6 @@ export default { autoBillDrawer, autoBillPaymentDrawer }, - watch: { - checkedKeys(val) { - this.form.estateIds = val.checked; - }, - }, data() { return { //编辑抽屉 @@ -167,7 +173,11 @@ export default { {title: "费用名称", dataIndex: "name",width: 100}, {title: "计费方式", dataIndex: "billingType",width: 100}, {title: "计量方式", dataIndex: "calculateType",width: 100}, - {title: "计量单价", dataIndex: "calculateUnit",width: 100}, + {title: "计量单价", dataIndex: "calculateUnit",width: 100, + customRender: function (calculateUnit) { + return (calculateUnit*1).toFixed(2) + }, + }, {title: "备注", dataIndex: "remarks"}, ], //////// @@ -251,13 +261,14 @@ export default { getApi() { findEstateCascade().then(res => { let data = res.data; - data.forEach(ele => { - ele.childList.forEach(el => { - el.checkable = false - }); - ele.checkable = false - }) + // data.forEach(ele => { + // ele.childList.forEach(el => { + // el.checkable = false + // }); + // ele.checkable = false + // }) this.roomTreeData = data + deleteIds(this.roomTreeData); }); chargesList({pageNum: 1,size: 1000}).then(res => { let data = res.data.rows; @@ -282,6 +293,15 @@ export default { success() { this.getData(); }, + onCheck(checkedKeys) { + let ids = []; + for (let id of checkedKeys) { + if (typeof id == "number") { + ids.push(id); + } + } + this.form.estateIds = ids; + }, //手动生成账单 addBill() { this.addShow = true