Merge branch 'master' into 2.0

src/views/dashboard/IndexChart.vue

@@ -48,11 +48,20 @@
       <h3 class="box-title">待处理事务（入驻待审核）</h3>
       <div class="content" v-if="waitAuditList.length > 0">
         <div class="item" v-for="(item, index) in waitAuditList" :key="index">
-          <p>入驻物业集团名称：{{ item.propertyName }}</p>
-          <p>申请入驻小区数量：{{ item.empowerCommunityNum }}</p>
-          <p>申请入驻物业时间：{{ item.createTime }}</p>
-          <p>添加人：{{ item.createBy }}</p>
-          <a-button type="primary" size="small" @click="toOperation(item)">审核</a-button>
+          <template v-if="item[0].creditCode">
+            <p>入驻物业集团名称：{{ item[0].propertyName }}</p>
+            <p>申请入驻小区数量：{{ item[0].empowerCommunityNum }}</p>
+            <p>申请入驻物业时间：{{ item[0].createTime }}</p>
+            <p>添加人：{{ item[0].createBy }}</p>
+            <a-button type="primary" size="small" @click="toOperation(item[0], 1)">审核</a-button>
+          </template>
+          <template v-else>
+            <p>入驻社区名称：{{ item[0].councilsName }}</p>
+            <p>申请入驻小区数量：{{ item[0].empowerCommunityNum }}</p>
+            <p>申请入驻社区时间：{{ item[0].createTime }}</p>
+            <p>添加人：{{ item[0].createBy }}</p>
+            <a-button type="primary" size="small" @click="toOperation(item[0], 2)">审核</a-button>
+          </template>
         </div>
       </div>
       <div class="content" v-else>
@@ -171,10 +180,16 @@ export default {
         }) || []
       this.mapEcharts()
     },
-    toOperation(record) {
-      this.$router.push({
-        path: '/settled/propertyDetails?type=audit&id=' + record.id,
-      })
+    toOperation(record, type) {
+      if(type === 1) {
+        this.$router.push({
+          path: '/settled/propertyDetails?type=audit&id=' + record.id,
+        })
+      } else {
+        this.$router.push({
+          path: '/settled/communityDetails?type=audit&id=' + record.id,
+        })
+      }
     },
     //地图
     mapEcharts() {

src/views/settled/PropertyDetails.vue

@@ -103,7 +103,7 @@
               <a-form-model-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingStandardId">
                 <a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%" @change="onValidatorNum">
                   <a-select-option v-for="item in costList" :key="item.id"
-                    :value="item.id">{{item.chargingName}}（{{item.empowerNum}}个社区）</a-select-option>
+                    :value="item.id">{{item.chargingName}}（{{item.empowerNum}}个小区）</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>

src/views/settled/community/communityDetails.vue

@@ -89,7 +89,7 @@
               <a-form-model-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingStandardId">
                 <a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" style="width: 100%" @change="onValidatorNum">
                   <a-select-option v-for="item in costList" :key="item.id"
-                    :value="item.id">{{item.chargingName}}（{{item.empowerNum}}个社区）</a-select-option>
+                    :value="item.id">{{item.chargingName}}（{{item.empowerNum}}个小区）</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>