加载不出来

operationSupport/src/components/common/organTree.vue

@@ -69,26 +69,40 @@ export default {
             let unitPa = {
                 id: e.id,
                 communityName: '',
+                communityId: '',
                 buildingName: '',
+                buildingId: '',
                 unitName: '',
+                unitId: '',
                 houseName: '',
+                houseId: '',
                 type: e.type
             };
             let thisObj = this.$refs.tree.getNode(e);
             if (e.type == 'building') {
                 unitPa.communityName = thisObj.parent.data.name;
+                unitPa.communityId = thisObj.parent.data.value;
                 unitPa.buildingName = e.name;
+                unitPa.buildingId = e.value;
             } else if (e.type == 'unit') {
                 unitPa.communityName = thisObj.parent.parent.data.name;
+                unitPa.communityId = thisObj.parent.parent.data.value;
                 unitPa.buildingName = thisObj.parent.data.name;
+                unitPa.buildingId = thisObj.parent.data.value;
                 unitPa.unitName = e.name;
+                unitPa.unitId = e.value;
             } else if (e.type == 'room') {
                 unitPa.communityName = thisObj.parent.parent.parent.data.name;
+                unitPa.communityId = thisObj.parent.parent.parent.data.value;
                 unitPa.buildingName = thisObj.parent.parent.data.name;
+                unitPa.buildingId = thisObj.parent.parent.data.value;
                 unitPa.unitName = thisObj.parent.data.name;
+                unitPa.unitId = thisObj.parent.data.value;
                 unitPa.houseName = e.name;
+                unitPa.houseId = e.value;
             } else {
                 unitPa.communityName = e.name;
+                unitPa.communityId = e.value;
             }
 
             this.$emit('organId', unitPa);

operationSupport/src/views/payService/chargeSetting/index.vue

@@ -14,8 +14,6 @@
                     class="search-btn"
                     type="primary"
                     @click="mixins_search()"
-                    :disabled="mixins_onQuery"
-                    :loading="mixins_onQuery"
                     icon="el-icon-search"
                     >搜索</el-button
                 >
@@ -29,7 +27,6 @@
             <zz-table
                 :settings="{ showIndex: true, stripe: true }"
                 :cols="cols"
-                :loading="mixins_onQuery"
                 :data="mixins_list"
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
@@ -185,22 +182,25 @@ export default {
             if (newValue.type) {
                 let newValueIds = newValue.id.split('-');
                 this.chiData.type = newValueIds.length;
-                this.mixins_query.type = newValueIds.length;
                 if (newValue.type === 'community') {
-                    this.mixins_query.value = newValueIds[0];
-                    this.chiData.value = newValueIds[0];
+                    this.mixins_query.value = newValue.communityId;
+                    this.mixins_query.type = 1;
+                    this.chiData.value = newValue.communityId;
                     this.chiData.address = newValue.communityName;
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.value = newValueIds[1];
-                    this.chiData.value = newValueIds[1];
+                    this.mixins_query.value = newValue.buildingId;
+                    this.mixins_query.type = 2;
+                    this.chiData.value = newValue.buildingId;
                     this.chiData.address = newValue.communityName + ' ' + newValue.buildingName;
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.value = newValueIds[1] + ':' + newValueIds[2];
-                    this.chiData.value = newValueIds[1] + ':' + newValueIds[2];
+                    this.mixins_query.value = newValue.buildingId + ':' + newValue.unitId;
+                    this.mixins_query.type = 3;
+                    this.chiData.value = newValue.buildingId + ':' + newValue.unitId;
                     this.chiData.address = newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName;
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.value = newValueIds[3];
-                    this.chiData.value = newValueIds[3];
+                    this.mixins_query.value = newValue.houseId;
+                    this.mixins_query.type = 4;
+                    this.chiData.value = newValue.houseId;
                     this.chiData.address =
                         newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName;
                 }

operationSupport/src/views/payService/propertyFee/index.vue

@@ -18,8 +18,6 @@
                     class="search-btn"
                     type="primary"
                     @click="mixins_search()"
-                    :disabled="mixins_onQuery"
-                    :loading="mixins_onQuery"
                     icon="el-icon-search"
                     >搜索</el-button
                 >
@@ -45,7 +43,6 @@
                 v-if="statusTable"
                 :settings="{ showCheckbox: chargeStatus == 1, showIndex: chargeStatus == 2, stripe: true }"
                 :cols="chargeStatus == 1 ? cols : statusCols"
-                :loading="mixins_onQuery"
                 :data="mixins_list"
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
@@ -59,9 +56,6 @@
                         <el-tooltip v-show="chargeStatus == 2" class="item" effect="light" placement="bottom" content="详情">
                             <i class="zoniot_font zoniot-icon-xiangqing" @click="lookDetails(scope.row)"></i>
                         </el-tooltip>
-                        <!-- <el-tooltip v-show="chargeStatus == 2" class="item" effect="light" placement="bottom" content="打印">
-                            <i class="zoniot_font zoniot-icon-dayin" @click="deleteRow(scope.row)"></i>
-                        </el-tooltip> -->
                     </div>
                 </template>
             </zz-table>
@@ -305,28 +299,28 @@ export default {
                 let newValueIds = newValue.id.split('-');
                 this.chiData.type = newValue.type;
                 if (newValue.type === 'community') {
-                    this.mixins_query.communityId = newValueIds[0];
-                    this.chiData.value = newValueIds[0];
+                    this.mixins_query.communityId = newValue.communityId;
+                    this.chiData.value = newValue.communityId;
                     this.chiData.address = newValue.communityName;
                 } else if (newValue.type === 'building') {
-                    this.mixins_query.communityId = newValueIds[0];
-                    this.mixins_query.buildingId = newValueIds[1];
-                    this.chiData.value = newValueIds[1];
+                    this.mixins_query.communityId = newValue.communityId;
+                    this.mixins_query.buildingId = newValue.buildingId;
+                    this.chiData.value = newValue.buildingId;
                     this.chiData.address = newValue.communityName + ' ' + newValue.buildingName;
                 } else if (newValue.type === 'unit') {
-                    this.mixins_query.communityId = newValueIds[0];
-                    this.mixins_query.buildingId = newValueIds[1];
-                    this.mixins_query.unitName = newValueIds[2];
+                    this.mixins_query.communityId = newValue.communityId;
+                    this.mixins_query.buildingId = newValue.buildingId;
+                    this.mixins_query.unitName = newValue.unitId;
 
-                    this.chiData.value = newValueIds[1] + ':' + newValueIds[2];
+                    this.chiData.value = newValue.buildingId + ':' + newValue.unitId;
                     this.chiData.address = newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName;
                 } else if (newValue.type === 'room') {
-                    this.mixins_query.communityId = newValueIds[0];
-                    this.mixins_query.buildingId = newValueIds[1];
-                    this.mixins_query.unitName = newValueIds[2];
-                    this.mixins_query.houseId = newValueIds[3];
+                    this.mixins_query.communityId = newValue.communityId;
+                    this.mixins_query.buildingId = newValue.buildingId;
+                    this.mixins_query.unitName = newValue.unitId;
+                    this.mixins_query.houseId = newValue.houseId;
 
-                    this.chiData.value = newValueIds[3];
+                    this.chiData.value = newValue.houseId;
                     this.chiData.address =
                         newValue.communityName + ' ' + newValue.buildingName + ' ' + newValue.unitName + ' ' + newValue.houseName;
                 }