diff --git a/src/api/fee/writeOweFeeCallableApi.js b/src/api/fee/writeOweFeeCallableApi.js
index cd2a8c0..d255392 100644
--- a/src/api/fee/writeOweFeeCallableApi.js
+++ b/src/api/fee/writeOweFeeCallableApi.js
@@ -27,11 +27,8 @@ export function listFee(params) {
params
}).then(response => {
const res = response.data
- if (res.code == 0) {
resolve(res)
- } else {
- reject(new Error(res.msg || 'Failed to list fees'))
- }
+
}).catch(error => {
reject(error)
})
diff --git a/src/components/fee/audit.vue b/src/components/fee/audit.vue
index c3924a9..5600f5e 100644
--- a/src/components/fee/audit.vue
+++ b/src/components/fee/audit.vue
@@ -68,6 +68,7 @@ export default {
this.formData.remark = `${this.$t('audit.state.reject')}:${this.formData.remark}`
}
this.$emit('notifyAuditInfo', this.formData)
+ this.$emit('success', this.formData)
this.visible = false
}
})
diff --git a/src/components/fee/deleteOweFeeCallable.vue b/src/components/fee/deleteOweFeeCallable.vue
index d64fb4a..41cf235 100644
--- a/src/components/fee/deleteOweFeeCallable.vue
+++ b/src/components/fee/deleteOweFeeCallable.vue
@@ -53,6 +53,7 @@ export default {
this.dialogVisible = false
this.$emit('listOweFeeCallable', {})
this.$emit('listOwnerData', {})
+ this.$emit('success', {})
this.$message.success(this.$t('deleteOweFeeCallable.success'))
} else {
this.$message.error(res.msg)
diff --git a/src/components/fee/writeOweFeeCallable.vue b/src/components/fee/writeOweFeeCallable.vue
index 01f3ac8..3dd94b5 100644
--- a/src/components/fee/writeOweFeeCallable.vue
+++ b/src/components/fee/writeOweFeeCallable.vue
@@ -1,37 +1,22 @@
-
+
-
+
-
+
-
- {{item.feeName}}
+
+ {{ item.feeName }}
-
+
@@ -88,6 +73,7 @@ export default {
this.clearWriteOweFeeCallable()
this.$emit('listOweFeeCallable', {})
this.$emit('listOwnerData', {})
+ this.$emit('success', {})
this.$message.success(this.$t('writeOweFeeCallable.success'))
} else {
this.$message.error(res.msg)
diff --git a/src/views/fee/addOweFeeCallableList.vue b/src/views/fee/addOweFeeCallableList.vue
index 0c4fed5..e4db533 100644
--- a/src/views/fee/addOweFeeCallableList.vue
+++ b/src/views/fee/addOweFeeCallableList.vue
@@ -5,7 +5,7 @@
{{ $t('addOweFeeCallable.title') }}
-
+
diff --git a/src/views/fee/createFeeByComboList.vue b/src/views/fee/createFeeByComboList.vue
index e79c565..417c821 100644
--- a/src/views/fee/createFeeByComboList.vue
+++ b/src/views/fee/createFeeByComboList.vue
@@ -47,7 +47,7 @@
+ >
@@ -103,6 +103,7 @@ export default {
}
const { data } = await listFeeComboMember(params)
this.createFeeByComboInfo.selectConfigIds = []
+ console.log('data:', data)
data.forEach(config => {
config.startTime = ''
config.endTime = ''
diff --git a/src/views/fee/feeComboManageList.vue b/src/views/fee/feeComboManageList.vue
index ef91a19..cf7310b 100644
--- a/src/views/fee/feeComboManageList.vue
+++ b/src/views/fee/feeComboManageList.vue
@@ -7,11 +7,7 @@
-
+
@@ -29,86 +25,39 @@
{{ $t('feeComboManage.list.title') }}
-
+
{{ $t('common.add') }}
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{{ $t('feeComboManage.operation.feeItems') }}
-
+
{{ $t('common.edit') }}
-
+
{{ $t('common.delete') }}
-
-
+
-
+
-
+
@@ -27,11 +27,11 @@
-
+
-
+
diff --git a/src/views/fee/payFeeAuditManageList.vue b/src/views/fee/payFeeAuditManageList.vue
index d57d731..54f0dfb 100644
--- a/src/views/fee/payFeeAuditManageList.vue
+++ b/src/views/fee/payFeeAuditManageList.vue
@@ -185,7 +185,7 @@ export default {
},
handleDetail(row) {
this.$router.push({
- path: '/fee/propertyFee',
+ path: '/views/fee/propertyFee',
query: row
})
},
diff --git a/src/views/fee/payFeeBatchList.vue b/src/views/fee/payFeeBatchList.vue
index 8a1b7cb..d645454 100644
--- a/src/views/fee/payFeeBatchList.vue
+++ b/src/views/fee/payFeeBatchList.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/src/views/fee/staffFeeManageList.vue b/src/views/fee/staffFeeManageList.vue
index 3b495bf..7ba0981 100644
--- a/src/views/fee/staffFeeManageList.vue
+++ b/src/views/fee/staffFeeManageList.vue
@@ -6,29 +6,18 @@
{{ $t('staffFeeManage.search.title') }}
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -48,59 +37,28 @@
{{ $t('staffFeeManage.list.title') }}
-
+
{{ $t('common.export') }}
-
-
-
-
+
+
+
+
{{ scope.row.receivableAmount }} {{ $t('staffFeeManage.table.yuan') }}
-
+
{{ scope.row.receivedAmount }} {{ $t('staffFeeManage.table.yuan') }}
-
+
@@ -184,9 +142,11 @@ export default {