[update] 全所统计页面；资料目录维护查询展开搜索结果；去掉定时催款按钮

src/views/dataNetworkDiskManagement/dataDirectory/DataDirectoryMaintenance.vue

@@ -18,13 +18,18 @@
           </div>
           <!--          /查询区域-->
           <!--          树形数据-->
-          <a-tree
-            v-model="selectedRowKeys"
-            checkable
-            :tree-data="dataSource"
-            :expandedKeys="expandedKeys"
-            :replaceFields="replaceFields"
-            @select="onSelect"/>
+          <a-spin :spinning="loading">
+            <template v-if="dataSource.length > 0">
+              <a-tree
+                v-model="selectedRowKeys"
+                checkable
+                :tree-data="dataSource"
+                :expandedKeys="expandedKeys"
+                :replaceFields="replaceFields"
+                @select="onSelect"/>
+            </template>
+            <a-empty v-else></a-empty>
+          </a-spin>
         </div>
         <!--        /左侧区域-->
         <div class="data-directory-container-divider"></div>
@@ -64,7 +69,8 @@ export default {
       queryParam: {},
       dataSource: [],
       selectedRowKeys: [],
-      expandedKeys: []
+      expandedKeys: [],
+      loading: false
     }
   },
   watch: {
@@ -110,10 +116,14 @@ export default {
       }
       let params = this.queryParam
       this.loading = true
+      console.log(this.queryParam)
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
+          this.expandedKeys = []
           this.dataSource = res.result.records || res.result
-          this.getExpandKeys(this.dataSource)
+          if (this.queryParam.hasOwnProperty.call(this.queryParam, 'name') && this.queryParam.name !== '' && this.dataSource.length > 0) {
+            this.getExpandKeys(this.dataSource)
+          }
           //清空列表选中
           this.selectedRowKeys = []
         }

src/views/financialManagement/dunning/DunningList.vue

@@ -29,7 +29,7 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" @click="setTimedDunning">设置定时催款</a-button>
+<!--        <a-button type="primary" @click="setTimedDunning">设置定时催款</a-button>-->
         <a-button type="primary" icon="export" @click="handleExportXls('到账开票')">导出</a-button>
       </div>
       <!--    操作按钮区域-end-->
@@ -53,7 +53,7 @@
           <!--        项目名称-->
           <template slot="projectName" slot-scope="text, record">
             <j-ellipsis :value="text" :length="18" class="primary-color"
-                        @click="toProjectMaintenance(record)"></j-ellipsis>
+                        @click="openDetailModal(record)"></j-ellipsis>
           </template>
 
           <template slot="text" slot-scope="text">

src/views/statisticalReport/WholeInstituteStatisticsList.vue

@@ -0,0 +1,315 @@
+<!--全所统计-->
+<template>
+  <div>
+    <page-header-title :img-for-icon="IconImg"></page-header-title>
+
+    <a-card :bordered="false">
+      <!--    查询区域-start -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入来款单位" v-model="queryParam.contractNum"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来款项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入来款项目" v-model="queryParam.contractName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="项目负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <select-principal placeholder="请选择项目负责人" v-model="queryParam.principalId"></select-principal>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="所属科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-tree-select
+                  style="width:100%"
+                  :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflow-y': 'auto' }"
+                  :treeData="treeDepartData"
+                  v-model="queryParam.departId"
+                  placeholder="请选择科室">
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入应收款项" v-model="queryParam.contractName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-row>
+                <a-col :span="1">~</a-col>
+                <a-col :span="18">
+                  <a-input placeholder="请输入应收款项" v-model="queryParam.contractName"></a-input>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.paymentDate"></j-year-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="是否打包" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.pack"
+                                   placeholder="请选择是否打包"
+                                   dictCode="yn"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="付款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.pack"
+                                   placeholder="请选择付款状态"
+                                   dictCode="yn"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+              <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--    /查询区域-end-->
+
+      <!--    操作按钮区域-->
+      <div class="table-operator">
+        <a-button type="primary" icon="export" @click="handleExportXls('全所统计')">导出</a-button>
+      </div>
+      <!--    操作按钮区域-end-->
+
+      <!--    table表格区域-->
+      <div>
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1100}"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+          <!--        项目名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="18" class="primary-color"
+                        @click="openDetailModal(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+          </template>
+
+          <template slot="footer" slot-scope="currentPageData">
+
+            <a-table
+              size="middle"
+              rowKey="id"
+              :columns="columnsFooter"
+              :scroll="{x: 1100}"
+              :dataSource="footerDataSource"
+              :showHeader="false"
+              :pagination="false"
+              class="j-table-force-nowrap footer-table">
+
+              <!--        项目名称-->
+              <template slot="projectName" slot-scope="text, record">
+                <j-ellipsis :value="text" :length="18" class="primary-color"
+                            @click="openDetailModal(record)"></j-ellipsis>
+              </template>
+
+              <template slot="text" slot-scope="text">
+                <j-ellipsis :value="text" :length="18"></j-ellipsis>
+              </template>
+
+            </a-table>
+          </template>
+
+        </a-table>
+      </div>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
+import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
+import { JeroListMixin } from '../../mixins/JeroListMixin'
+import { queryDepartTreeList } from '../../api/api'
+import SelectPrincipal from '../../components/company/SelectPrincipal'
+import JYearDate from '../../components/jero/JYearDate'
+
+export default {
+  name: 'WholeInstituteStatisticsList',
+  components: { PageHeaderTitle, SelectPrincipal, JYearDate },
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      IconImg,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      treeDepartData: [],
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '项目名称',
+          align: 'center',
+          // width: 200,
+          dataIndex: 'chargeProject',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '负责人',
+          align: 'center',
+          width: 140,
+          dataIndex: 'principalName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '所属科室',
+          align: 'center',
+          width: 140,
+          dataIndex: 'departId',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '应收金额',
+          align: 'center',
+          width: 140,
+          dataIndex: 'receivableAmount'
+        }, {
+          title: '实收金额',
+          align: 'center',
+          width: 140,
+          dataIndex: 'paidAmount'
+        }, {
+          title: '来款用途',
+          align: 'center',
+          dataIndex: 'chargeUse_dictText',
+          width: 140
+        }
+      ],
+      columnsFooter: [
+        {
+          title: '序号',
+          dataIndex: 'title',
+          key: 'rowIndex',
+          width: 120,
+          align: 'center'
+        }, {
+          title: '项目名称',
+          align: 'center',
+          // width: 200,
+          dataIndex: 'chargeProject',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '负责人',
+          align: 'center',
+          width: 140,
+          dataIndex: 'principalName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '所属科室',
+          align: 'center',
+          width: 140,
+          dataIndex: 'departId',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '应收金额',
+          align: 'center',
+          width: 140,
+          dataIndex: 'receivableAmount'
+        }, {
+          title: '实收金额',
+          align: 'center',
+          width: 140,
+          dataIndex: 'paidAmount'
+        }, {
+          title: '来款用途',
+          align: 'center',
+          dataIndex: 'chargeUse_dictText',
+          width: 140
+        }
+      ],
+      footerDataSource: [
+        {
+          id: 1,
+          title: '总计',
+          receivableAmount: 4000,
+          paidAmount: 200
+        }
+      ],
+      url: {
+        list: ''
+      }
+    }
+  },
+  created() {
+    this.loadDepartTreeData()
+  },
+  methods: {
+    /**
+     * 获取科室（部门）数据
+     */
+    loadDepartTreeData() {
+      queryDepartTreeList().then((res) => {
+        if (res.success) {
+          this.treeDepartData = []
+          let treeList = res.result
+          for (let a = 0; a < treeList.length; a++) {
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            this.treeDepartData.push(temp)
+          }
+        } else {
+          console.log(res.message)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+/deep/ .ant-table-footer {
+  padding: 0 0;
+}
+
+/deep/ .ant-table.ant-table-bordered .ant-table-footer {
+  border-left: none;
+  margin-top: -2px;
+}
+
+.footer-table {
+  /deep/ .ant-table-tbody > tr > td {
+    border: none;
+  }
+}
+</style>