Merge branch 'change0706'

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue

@@ -36,6 +36,24 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :xxl="6" :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item
+                label="部门"
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol">
+                <a-tree-select
+                  :multiple="false"
+                  show-search
+                  tree-default-expand-all
+                  tree-node-filter-prop="title"
+                  style="width:100%"
+                  :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
+                  :treeData="treeDepartData"
+                  v-model="queryParam.departId"
+                  placeholder="请选择部门">
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
               <a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input
@@ -170,6 +188,7 @@ import JYearDate from '../../../components/jero/JYearDate'
 import { getAction } from '../../../api/manage'
 import {formatMoney} from '@/utils/formatMoney'
 import { MonthData } from '../statisticData'
+import {queryDepartTreeList} from '@api/api'
 
 const defaultTableColumns = [
   {
@@ -269,6 +288,7 @@ export default {
       },
       columns: [firstColumnTop, ...defaultTableColumns],
       dataSource: [],
+      treeDepartData:[],// 组织机构
       // 总计表头，与主表表头一致
       columnsFooter: [firstColumnFooter, ...defaultTableColumns],
       // 给定当年作为来款年份默认查询条件
@@ -282,6 +302,9 @@ export default {
       footerDataSource: []
     }
   },
+  created() {
+    this.loadDepartTreeData()
+  },
   methods: {
     formatMoney,
     loadData(arg) {
@@ -324,6 +347,23 @@ export default {
         this.loading = false
       })
     },
+    /*
+    *  组织机构下拉数据
+    * */
+    loadDepartTreeData() {
+      const that = this
+      queryDepartTreeList().then((res) => {
+        if (res.success) {
+          that.treeDepartData = []
+          let treeList = res.result
+          for (let a = 0; a < treeList.length; a++) {
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            that.treeDepartData.push(temp)
+          }
+        }
+      })
+    },
     searchReset() {
       this.lastQueryParam = {
         year: new Date().getFullYear().toString()