Merge branch 'master' into dev

* master:
  zx

# Conflicts:
#	src/views/Layout/index.vue

src/views/Basic/Authority/depend/permissions.vue

@@ -90,6 +90,7 @@ export default {
 				halfChecked: [],
 			},
 			selectedKeys: [],
+			activeKeys: [],
 			menus: [], //页面菜单
 			actionsList: [], //操作
 			actions: {
@@ -216,7 +217,9 @@ export default {
 			this.expandedKeys = e;
 		},
 		onSelect(selectedKeys, info) {
+			if(selectedKeys.length != 0) {
 				this.selectedKeys = selectedKeys;
+			}
 			getActions({ roleId: this.roleId, menusId: this.selectedKeys[0] }).then(
 					(res) => {
 						this.actionsList = res.data;

src/views/Basic/WorkOrder/addWorkOrder.vue

@@ -30,11 +30,13 @@
             </a-col>
             <a-col :span="8" v-if="form.identity == 1">
               <a-form-model-item label="选择房屋" prop="estateId" :rules="[{ required: true, message: '请选择房屋' }]">
-                <a-select v-model="form.estateId" placeholder="请选择房屋" @change="getAppName">
+                <!-- <a-select v-model="form.estateId" placeholder="请选择房屋" @change="getAppName">
                   <a-select-option v-for="(item, index) in options.estateId" :key="index" :value="item.id">
                     {{item.name}}
                   </a-select-option>
-                </a-select>
+                </a-select> -->
+                <a-cascader v-model="casVal" @change="chooseHouse" :field-names="{label: 'name', value: 'id', children: 'childList' }" :options="options.estateId" placeholder="请选择房屋">
+                </a-cascader>
               </a-form-model-item>
             </a-col>
             <a-col :span="8" v-else>
@@ -144,6 +146,7 @@ export default {
       options,
       applicantIds: [],
       departmentIds: [],
+      casVal:[]
 		};
 	},
 	props: {
@@ -221,7 +224,7 @@ export default {
 		},
     //选择房屋后的回调
     getAppName(val) {
-        form.applicantId = undefined;
+        this.form.applicantId = undefined;
         findTenantByEstateId({estateId: val}).then(res => {
            let data = res.data;
            this.applicantIds = data;
@@ -233,6 +236,12 @@ export default {
           let data = res.data.rows;
           this.departmentIds = data
         })
+    },
+    //选择房屋
+    chooseHouse(val) {
+      let v = val;
+      let index = val.length
+      this.form.estateId = v[index-1]
     }
 	},
 	watch: {

src/views/Basic/WorkOrder/form.js

@@ -1,6 +1,7 @@
 import {houseList} from "@/api/basic/estate";
 import {departmentList} from "@/api/basic/department"
 import {getAllWorkOrderType} from "@/api/basic/Workorder"
+import {findEstateCascade} from "@/api/basic/estate"
 
 let applicantIds = []
 let estateIds = []
@@ -35,14 +36,21 @@ departmentList().then(res => {
 	});
 })
 
-houseList({pageNum: 1,size: 100000}).then(res => {
-	let data = res.data.rows;
+// houseList({pageNum: 1,size: 100000}).then(res => {
+// 	let data = res.data.rows;
+// 	data.forEach(ele => {
+// 		let obj = {
+// 			id: ele.id,
+// 			name: ele.manageUnitName+'/'+ele.floorLocation+'楼/'+ele.name
+// 		};
+// 		estateIds.push(obj);
+// 	})
+// })
+
+findEstateCascade().then(res => {
+	let data = res.data;
 	data.forEach(ele => {
-		let obj = {
-			id: ele.id,
-			name: ele.manageUnitName+'/'+ele.floorLocation+'楼/'+ele.name
-		};
-		estateIds.push(obj);
+		estateIds.push(ele);
 	})
 })
 

src/views/Payment/BillManage/_payInfo/depend/config.js

@@ -2,9 +2,9 @@ export const formItem = [
 	{
 		type: 'select',
 		label:'账单类型',
-		prop:'',
+		prop:'type',
 		option:[{ id:1,name:'手动生成'},{ id:2,name:'自动生成'}],
-		placeholder:'请选择'
+		placeholder:'请选择账单类型'
 	},
 ]
 export const columns = [

src/views/Payment/BillManage/_payInfo/index.vue

@@ -1,7 +1,34 @@
 <template>
   <div>
 	<div class="cardTitle">账单明细</div>
-    <searchForm :formItem="formItem" @getSearch="search($event)"></searchForm>
+    <div class="search-form">
+        <a-form-model style="margin-left: 32px" layout='inline'>
+            <a-form-model-item label="流水号">
+                <a-select style="width: 150px" v-model="form.type" placeholder="请选择">
+                    <a-select-option :value="1">
+                        手动生成
+                    </a-select-option>
+                    <a-select-option :value="2">
+                        自动生成
+                    </a-select-option>
+                </a-select>
+            </a-form-model-item>
+            <a-form-model-item style="margin-left: 32px" label="关联房屋" >
+                <a-cascader v-model="casVal" @change="chooseHouse" :field-names="{label: 'name', value: 'id', children: 'childList' }" :options="houseInfo" style="width: 200px" placeholder="请选择">
+                </a-cascader>
+            </a-form-model-item>
+            <a-form-model-item style="margin-left: 32px" label="收费标准">
+                <a-select v-model="chargesVal" style="width: 150px" @change="chargeChoose">
+                    <a-select-option v-for="(item) in chargeInfo" :key="item.id" :value="item.id">
+                        {{item.name}}
+                    </a-select-option>
+                </a-select>
+            </a-form-model-item>
+        </a-form-model>
+        <div class="btn-box"><a-button type="primary" @click="search"> 查询 </a-button>
+        <a-button style="margin-left: 10px" @click="resetForm"> 重置 </a-button></div>
+    </div>
+    <!-- <searchForm :formItem="formItem" @getSearch="search($event)"></searchForm> -->
     <a-table :columns="columns" :data-source="tableData" :pagination="pagination" :scroll="{x: 1900}" @change="handlerPage">
         <template slot="unitName" slot-scope="text, record">
             {{record.buildingName}}/{{record.unitName}}/{{record.estateName}}
@@ -85,7 +112,8 @@
 <script>
 import { formItem, columns, pagination } from "./depend/config"
 import { getBillList, abolition, recover, findBillOrderList, offlinePayments } from "@/api/payment/billManagement"
-
+import {findEstateCascade} from "@/api/basic/estate"
+import {chargesList} from "@/api/payment/chargeStandardManage"
 export default {
     name: 'payInfo',
     data() {
@@ -93,8 +121,11 @@ export default {
             form: {
                 type: undefined,
                 estateId: undefined,
-                chargesIds: undefined
+                chargesIds: []
             },
+            casVal: [],
+            chargesVal: undefined,
+            /////
             tableData:[],
             formItem,
             columns,
@@ -145,12 +176,27 @@ export default {
             offDetail: {},
             //支付
             paymentShow: false,
+            //房屋信息
+            houseInfo: [],
+            //收费标准信息
+            chargeInfo: []
         }
     },
     mounted() {
+        this.getApi()
         this.getData()
     },
     methods: {
+        getApi() {
+            findEstateCascade().then(res => {
+                let data = res.data;
+                this.houseInfo = data;
+            })
+            chargesList({pageNum:1,size:1000}).then(res => {
+                let data = res.data;
+                this.chargeInfo = data.rows
+            })
+        },
         getData() {
             let obj = Object.assign({pageNum: this.pagination.current, size: this.pagination.pageSize},this.form)
             getBillList(obj).then(res => {
@@ -159,10 +205,27 @@ export default {
                 this.pagination.total = data.total
             })
         },
-        search(data) {
-            this.form = data;
+        search() {
             this.getData()
         },
+        resetForm() {
+            this.form = {
+                type: undefined,
+                estateId: undefined,
+                chargesIds: undefined
+            };
+            this.casVal = [];
+            this.chargesVal = undefined;
+            this.getData();
+        },
+        chooseHouse(val) {
+            let v = val;
+            let index = val.length
+            this.form.estateId = v[index-1]
+        },
+        chargeChoose(val) {
+            this.form.chargesIds = [val]
+        },
         handlerPage(val) {
             this.pagination.current = val.current;
             this.pagination.pageSize = val.pageSize;
@@ -248,6 +311,15 @@ export default {
 </script>
 
 <style lang="less">
+.search-form {
+    text-align: left;
+    background: #f9f9f9;
+    padding-top: 25px;
+    padding-bottom: 1px;
+}
+.btn-box{
+  margin:10px 0 15px 100px;
+}
 .billTitle {
     font-family: 'PingFang SC';
     font-style: normal;

src/views/Payment/PrepayManage/depend/preList.vue

@@ -19,10 +19,6 @@
           :data-source="tableData"
           :pagination="pagination"
           @change="handleTableChange"
-          :row-selection="{
-            selectedRowKeys: selectedRowKeys,
-            onChange: selectionChoosed,
-          }"
           :row-key="
             (record, index) => {
               return record.id;