From 5ebcfc676946a74e45f49baf60851a0ecfe4db10 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 17 Aug 2022 11:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=20=E5=AE=A1=E6=A0=B8=20=E8=AF=A6=E6=83=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=81=94=E8=A1=8C=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue         |  4 ++
 .../modules/CompanyAdminModule.vue            |  7 ++++
 .../modules/AuditProofModule.vue              | 13 +++++-
 .../WorkingGroupPaymentStatisticsList.vue     | 40 +++++++++++++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index e0e9a93..f60bb8a 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -108,6 +108,10 @@
           <label>银行账号：</label>
           <span>{{ basicInfo.bankAccount }}</span>
         </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>联行号：</label>
+          <span>{{ basicInfo.linkBankNumber || '' }}</span>
+        </a-col>
       </a-row>
     </section>
     <!--企业信息end-->
diff --git a/src/views/businessManagement/modules/CompanyAdminModule.vue b/src/views/businessManagement/modules/CompanyAdminModule.vue
index ee44038..f6a8ab5 100644
--- a/src/views/businessManagement/modules/CompanyAdminModule.vue
+++ b/src/views/businessManagement/modules/CompanyAdminModule.vue
@@ -45,6 +45,7 @@
                        :maxLength="11"
                        v-decorator="['phone',validatorRules.phone]"></a-input>
             </a-form-item>
+            <span class="notice">更改手机号,需要重新登录企业端设置密码</span>
           </a-col>
         </a-row>
       </a-form>
@@ -220,4 +221,10 @@ export default {
 </script>
 
 <style scoped lang="less">
+.notice {
+  position: absolute;
+  color:red;
+  left: 26%;
+  bottom: -17%;
+}
 </style>
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
index 696fad6..6b61ef7 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
@@ -163,6 +163,15 @@
                     :maxLength="50"></a-input>
                 </a-form-item>
               </a-col>
+              <a-col :span="12">
+                <a-form-item label="联行号" :labelCol="labelPayCol" :wrapperCol="wrapperPayCol">
+                  <a-input
+                    @change="(e) => {e.target.value = e.target.value.trim()}"
+                    v-decorator="['linkBankNumber',{ rules: validatorRules.linkBankNumber.rules, validateTrigger: 'blur', initialValue:proofInfo.linkBankNumber}]"
+                    placeholder="请输入联行号"
+                    :maxLength="50"></a-input>
+                </a-form-item>
+              </a-col>
             </a-row>
           </template>
         </div>
@@ -290,7 +299,9 @@ export default {
         invoiceAddress: {rules: [{required: true, message: '请输入单位地址'}], validateTrigger: 'blur'},
         invoicePhone: {rules: [{required: true, validator: this.handleInvoicePhoneCheck}], validateTrigger: 'blur'},
         depositBank: {rules: [{required: true, message: '请输入开户银行'}], validateTrigger: 'blur'},
-        bankAccount: {rules: [{required: true, message: '请输入银行账户'}], validateTrigger: 'blur'}
+        bankAccount: {rules: [{required: true, message: '请输入银行账户'}], validateTrigger: 'blur'},
+        linkBankNumber: {rules: [{required: false, message: '请输入联行号'}], validateTrigger: 'blur'}
+
       },
       // 项目缴费凭证信息
       proofInfo: {},
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
index 5cc1073..336996b 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
+++ b/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()