Merge branch 'master' of http://47.105.205.210/property-platform/total-platform

src/views/settled/RecordList.vue

@@ -115,8 +115,8 @@ import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'
 const columns = [
   {
     title: '对账单号',
-    dataIndex: 'propertyName',
-    key: 'propertyName',
+    dataIndex: 'id',
+    key: 'id',
     align: 'center',
   },
   {
@@ -127,32 +127,32 @@ const columns = [
   },
   {
     title: '所属物业集团',
-    dataIndex: 'contactName',
-    key: 'contactName',
+    dataIndex: 'propertyName',
+    key: 'propertyName',
     align: 'center',
   },
   {
     title: '对账开始日期',
-    dataIndex: 'contactPhone',
-    key: 'contactPhone',
+    dataIndex: 'reconciliationBeginDate',
+    key: 'reconciliationBeginDate',
     align: 'center',
   },
   {
     title: '对账结束日期',
-    dataIndex: 'contactPhone',
-    key: 'contactPhone',
+    dataIndex: 'reconciliationEndDate',
+    key: 'reconciliationEndDate',
     align: 'center',
   },
   {
     title: '对账金额',
-    dataIndex: 'contactPhone',
-    key: 'contactPhone',
+    dataIndex: 'reconciliationAmount',
+    key: 'reconciliationAmount',
     align: 'center',
   },
   {
     title: '操作日期',
-    dataIndex: 'contactPhone',
-    key: 'contactPhone',
+    dataIndex: 'updateTime',
+    key: 'updateTime',
     align: 'center',
   },
   {
@@ -163,16 +163,16 @@ const columns = [
   },
   {
     title: '审核状态',
-    dataIndex: 'empowerEndDate',
-    scopedSlots: { customRender: 'empowerEndDate' },
+    dataIndex: 'auditStatus',
+    scopedSlots: { customRender: 'auditStatus' },
     align: 'center',
   },
   {
     title: '公司审核状态',
-    dataIndex: 'auditStatus',
-    key: 'auditStatus',
+    dataIndex: 'companyAuditStatus',
+    key: 'companyAuditStatus',
     customRender: function (text) {
-      return filterDictTextByCache('auditStatus', text)
+      return filterDictTextByCache('companyAuditStatus', text)
     },
   },
   {
@@ -204,9 +204,9 @@ export default {
         showSizeChanger: true,
       },
       url: {
-        list: '/property-central/property/propertySettled/list',
-        delete: '/property-central/property/propertySettled/delete',
-        deleteBatch: '/property-central/property/propertySettled/deleteBatch',
+        list: '/property-central/property/communityReconciliation/list',
+        delete: '/property-central/property/communityReconciliation/delete',
+        deleteBatch: '/property-central/property/communityReconciliation/deleteBatch',
       },
     }
   },