新增入驻物业详情页

src/views/dashboard/IndexChart.vue

@@ -7,7 +7,9 @@
           <div>
             <p style="color:#666;margin-bottom:5px;">入驻物业公司数量</p>
             <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.settledNum}}
-              <span v-if="statistical.monthSettledNum > 0"><a-icon type="arrow-up" color="#1890ff" />{{ statistical.monthSettledNum }}</span></p>
+              <span v-if="statistical.monthSettledNum > 0"><a-icon type="arrow-up"
+                  color="#1890ff" />{{ statistical.monthSettledNum }}</span>
+            </p>
           </div>
         </div>
       </a-col>
@@ -35,7 +37,9 @@
           <div>
             <p style="color:#666;margin-bottom:5px;">累计物业社区数量</p>
             <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.ownerNum}}
-              <span v-if="statistical.monthOwnerNum > 0"><a-icon type="arrow-up" color="#1890ff" />{{ statistical.monthOwnerNum }}</span></p>
+              <span v-if="statistical.monthOwnerNum > 0"><a-icon type="arrow-up"
+                  color="#1890ff" />{{ statistical.monthOwnerNum }}</span>
+            </p>
           </div>
         </div>
       </a-col>
@@ -165,28 +169,8 @@ export default {
       this.mapEcharts()
     },
     toOperation(record) {
-      let that = this
-      this.$confirm({
-        title: '确认审核物业集团：' + record.propertyName + '?',
-        closable: true,
-        okText: '审核通过',
-        cancelText: '审核驳回',
-        onOk() {
-          return auditPropertyApi({
-            id: record.id,
-            auditStatus: 'auditPass',
-          }).then((res) => {
-            that.getDataStatistics()
-          })
-        },
-        onCancel() {
-          return auditPropertyApi({
-            id: record.id,
-            auditStatus: 'refuse',
-          }).then((res) => {
-            that.getDataStatistics()
-          })
-        },
+      this.$router.push({
+        path: '/settled/propertyDetails?type=audit&id=' + record.id,
       })
     },
     //地图

src/views/settled/PropertyList.vue

@@ -27,11 +27,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="propertyDetails(1)" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
@@ -45,43 +45,34 @@
         <a style="margin-left: 24px" v-if="selectedRowKeys.length > 0" @click="onClearSelected">清空</a>
       </div>
 
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="pagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange"
-      >
+      <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
+        :dataSource="dataSource" :pagination="pagination" :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
+        @change="handleTableChange">
         <span slot="propertyStatus" slot-scope="text, record">
           <span>{{record.propertyStatus === 'normal' ? '正常' : '冻结'}}</span>
         </span>
         <span slot="action" slot-scope="text, record">
-          <a @click="onLoadDetail(record, 'edit')">编辑</a>
+          <a @click="propertyDetails(2, record.id)">编辑</a>
 
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
+              更多 <a-icon type="down" />
             </a>
             <a-menu slot="overlay">
               <a-menu-item v-if="record.auditStatus !== 'waitAudit'">
                 <a @click="handlePerssion(record.roleId)">授权</a>
               </a-menu-item>
               <a-menu-item>
-                <a href="javascript:;" @click="onLoadDetail(record)">详情</a>
+                <a href="javascript:;" @click="propertyDetails(4, record.id)">详情</a>
               </a-menu-item>
               <a-menu-item v-if="record.auditStatus === 'waitAudit'">
-                <a href="javascript:;" @click="onExamine(record)">审核</a>
+                <a href="javascript:;" @click="propertyDetails(3, record.id)">审核</a>
               </a-menu-item>
               <a-menu-item>
-                <a href="javascript:;" @click="onStatus(record)">{{record.propertyStatus === 'normal' ? '冻结' : '解冻'}}</a>
+                <a href="javascript:;"
+                  @click="onStatus(record)">{{record.propertyStatus === 'normal' ? '冻结' : '解冻'}}</a>
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
@@ -104,77 +95,77 @@
 </template>
 
 <script>
-  import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PropertySettledModal from './modules/PropertySettledModal'
-  import UserRoleModal from './modules/UserRoleModal'
-  import {filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
+import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import PropertySettledModal from './modules/PropertySettledModal'
+import UserRoleModal from './modules/UserRoleModal'
+import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'
 
-  const columns = [
+const columns = [
   {
     title: '物业名称',
     dataIndex: 'propertyName',
-      key: 'propertyName'
+    key: 'propertyName',
   },
   {
     title: '统一社会信用代码',
     dataIndex: 'creditCode',
-      key: 'creditCode'
+    key: 'creditCode',
   },
   {
     title: '联系人',
     dataIndex: 'contactName',
-      key: 'contactName'
+    key: 'contactName',
   },
   {
     title: '电话',
     dataIndex: 'contactPhone',
-      key: 'contactPhone'
+    key: 'contactPhone',
   },
   {
     title: '授权时间',
     dataIndex: 'empowerDate',
-      key: 'empowerDate'
+    key: 'empowerDate',
   },
   {
     title: '授权物业数量',
     dataIndex: 'ontrialCommunityNum',
-      key: 'ontrialCommunityNum'
+    key: 'ontrialCommunityNum',
   },
   {
     title: '审核状态',
     dataIndex: 'auditStatus',
     key: 'auditStatus',
-      customRender: function(text) {
-        return filterDictTextByCache('auditStatus', text);
-      }
+    customRender: function (text) {
+      return filterDictTextByCache('auditStatus', text)
+    },
   },
   {
     title: '到期提示',
     dataIndex: 'ontrialEndDate',
-      key: 'ontrialEndDate'
+    key: 'ontrialEndDate',
   },
   {
     title: '状态',
     dataIndex: 'propertyStatus',
     scopedSlots: { customRender: 'propertyStatus' },
-      key: 'propertyStatus'
+    key: 'propertyStatus',
   },
   {
     title: '操作',
     dataIndex: 'action',
     scopedSlots: { customRender: 'action' },
     align: 'center',
-      width: 150
-    }
-  ]
+    width: 150,
+  },
+]
 
-  export default {
+export default {
   name: 'PermissionListAsync',
   mixins: [JeecgListMixin],
   components: {
     PropertySettledModal,
-      UserRoleModal
+    UserRoleModal,
   },
   data() {
     return {
@@ -185,19 +176,38 @@
         total: 0,
         current: 1,
         pageSize: 10,
-          showSizeChanger: true
+        showSizeChanger: true,
       },
       url: {
-          list: "/property-central/property/propertySettled/list",
+        list: '/property-central/property/propertySettled/list',
         delete: '/property-central/property/propertySettled/delete',
-          deleteBatch: '/property-central/property/propertySettled/deleteBatch'
+        deleteBatch: '/property-central/property/propertySettled/deleteBatch',
       },
     }
   },
   methods: {
+    propertyDetails(type, id) {
+      if (type == 1) {
+        this.$router.push({
+          path: '/settled/propertyDetails?type=add',
+        })
+      } else if (type == 2) {
+        this.$router.push({
+          path: '/settled/propertyDetails?type=edit&id=' + id,
+        })
+      } else if (type == 3) {
+        this.$router.push({
+          path: '/settled/propertyDetails?type=audit&id=' + id,
+        })
+      } else if (type == 4) {
+        this.$router.push({
+          path: '/settled/propertyDetails?type=detail&id=' + id,
+        })
+      }
+    },
     onLoadDetail(record, type) {
       record['registAdress'] = [record.provinceCode, record.cityCode, record.countyCode]
-        if(type === 'edit') {
+      if (type === 'edit') {
         this.handleEdit(record)
       } else {
         this.handleDetail(record)
@@ -213,20 +223,20 @@
         onOk() {
           return auditPropertyApi({
             id: record.id,
-              auditStatus: 'auditPass'
-            }).then(res=> {
+            auditStatus: 'auditPass',
+          }).then((res) => {
             that.searchQuery()
           })
         },
         onCancel() {
           return auditPropertyApi({
             id: record.id,
-              auditStatus: 'refuse'
-            }).then(res=> {
+            auditStatus: 'refuse',
+          }).then((res) => {
             that.searchQuery()
           })
-          }
-        });
+        },
+      })
     },
     onStatus(record) {
       let that = this
@@ -237,20 +247,20 @@
         onOk() {
           return freezeOrPropertyApi({
             id: record.id,
-              status: `${record.propertyStatus === 'normal' ? 'freeze' : 'normal'}`
-            }).then(res=> {
+            status: `${record.propertyStatus === 'normal' ? 'freeze' : 'normal'}`,
+          }).then((res) => {
             that.searchQuery()
           })
         },
-          onCancel() {}
-        });
+        onCancel() {},
+      })
     },
     handlePerssion(roleId) {
-        this.$refs.modalUserRole.show(roleId);
-      }
-    }
-  }
+      this.$refs.modalUserRole.show(roleId)
+    },
+  },
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
\ No newline at end of file