From 66307087bdbaa4d98902e37cf2a19b91dee55154 Mon Sep 17 00:00:00 2001
From: fengchenchen <syxysoft.com>
Date: Thu, 7 Jul 2022 10:46:17 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20-=E7=BB=9F=E8=AE=A1=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F=EF=BC=9B=E6=89=93?=
 =?UTF-8?q?=E5=8C=85-=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE-=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=AC=BE=E7=94=A8?=
 =?UTF-8?q?=E9=80=94=20=E6=9F=A5=E8=AF=A2=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PackProjectSelectProjectModule.vue        | 13 +++++++++++--
 .../WholeInstituteStatisticsList.vue          | 19 ++++++++++---------
 .../DepartmentAllStatistics.vue               | 17 +++++++++--------
 .../IndividualPaymentStatisticsDetail.vue     | 17 +++++++++--------
 .../IndividualPaymentStatisticsList.vue       | 17 +++++++++--------
 .../ProjectPaymentStatisticsList.vue          | 17 +++++++++--------
 .../EnterprisePaymentStatisticsDetail.vue     | 17 +++++++++--------
 .../EnterprisePaymentStatisticsList.vue       | 18 +++++++++---------
 .../WorkingGroupPaymentStatisticsDetail.vue   | 17 +++++++++--------
 .../WorkingGroupPaymentStatisticsList.vue     | 17 +++++++++--------
 10 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
index 5c9cc89..0ea61af 100644
--- a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
+++ b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue
@@ -13,16 +13,25 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row>
-            <a-col :xl="8" :lg="9" :md="10" :sm="24">
+            <a-col :xl="6" :lg="9" :md="10" :sm="24">
               <a-form-item label="项目名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入项目名称" v-model="queryParam.projectName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="8" :lg="9" :md="10" :sm="24">
+            <a-col :xl="6" :lg="9" :md="10" :sm="24">
               <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="9" :md="10" :sm="24">
+              <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag
+                  dictCode="payment_charge_use"
+                  v-model="queryParam.chargeUse"
+                  placeholder="请选择来款用途"
+                ></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
index 3722391..19eee61 100644
--- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue
+++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
@@ -265,6 +265,14 @@ const defaultTableColumns = [
     dataIndex: 'pack',
     scopedSlots: {customRender: 'pack'}
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 150,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -282,21 +290,14 @@ const defaultTableColumns = [
     scopedSlots: {customRender: 'allMoney'}
   },
   {
-    title: '实收金额',
+    title: '到账金额',
     align: 'center',
     width: 150,
     sorter: true,
     dataIndex: 'comeAllMoney',
     scopedSlots: {customRender: 'allMoney'}
   },
-  {
-    title: '应收金额',
-    align: 'center',
-    width: 150,
-    dataIndex: 'allMoney',
-    sorter: true,
-    scopedSlots: {customRender: 'allMoney'}
-  },
+
   {
     title: '来款用途',
     align: 'center',
diff --git a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
index be2f03a..359dde8 100644
--- a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
+++ b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
@@ -121,6 +121,14 @@ const defaultTableColumns = [
     dataIndex: 'departName',
     scopedSlots: {customRender: 'text'}
   },
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -145,14 +153,7 @@ const defaultTableColumns = [
     sorter: true,
     scopedSlots: {customRender: 'allMoney'}
   },
-  {
-    title: '合同总金额',
-    align: 'center',
-    width: 160,
-    dataIndex: 'allMoney',
-    sorter: true,
-    scopedSlots: {customRender: 'allMoney'}
-  },
+
   {
     title: '确收率',
     align: 'center',
diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
index 403f7a2..f130440 100644
--- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
@@ -184,6 +184,14 @@ const defaultTableColumns = [
     dataIndex: 'pack',
     scopedSlots: { customRender: 'status-pack' }
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -208,14 +216,7 @@ const defaultTableColumns = [
     dataIndex: 'comeAllMoney',
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同金额',
-    align: 'center',
-    width: 160,
-    sorter: true,
-    dataIndex: 'allMoney',
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
   {
     title: '来款用途',
     align: 'center',
diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
index 9bd8166..c79fc91 100644
--- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
@@ -164,6 +164,14 @@ const defaultTableColumns = [
     dataIndex: 'principalName',
     scopedSlots: { customRender: 'projectName' }
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 140,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -188,14 +196,7 @@ const defaultTableColumns = [
     sorter: true,
     scopedSlots: {customRender: 'allMoney'}
   },
-  {
-    title: '合同金额',
-    align: 'center',
-    width: 140,
-    dataIndex: 'allMoney',
-    sorter: true,
-    scopedSlots: {customRender: 'allMoney'}
-  },
+
   {
     title: '个人完成率',
     align: 'center',
diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
index c05116b..3f877cc 100644
--- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
@@ -212,6 +212,14 @@ const defaultTableColumns = [
     dataIndex: 'pack',
     scopedSlots: { customRender: 'status-pack' }
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -236,14 +244,7 @@ const defaultTableColumns = [
     sorter: true,
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同金额',
-    align: 'center',
-    width: 160,
-    dataIndex: 'allMoney',
-    sorter: true,
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
   {
     title: '来款用途',
     align: 'center',
diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
index 0bb0f69..8c96482 100644
--- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
@@ -186,6 +186,14 @@ const defaultTableColumns = [
     dataIndex: 'pack',
     scopedSlots: { customRender: 'pack' }
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -210,14 +218,7 @@ const defaultTableColumns = [
     dataIndex: 'comeAllMoney',
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同金额',
-    align: 'center',
-    width: 160,
-    sorter: true,
-    dataIndex: 'allMoney',
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
 
   {
     title: '来款用途',
diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
index e8a448d..36f7f92 100644
--- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
+++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
@@ -165,7 +165,14 @@ const defaultTableColumns = [
     dataIndex: 'chargeCompanyName',
     scopedSlots: { customRender: 'text' }
   },
-
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -190,14 +197,7 @@ const defaultTableColumns = [
     dataIndex: 'comeAllMoney',
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同总金额',
-    align: 'center',
-    width: 160,
-    sorter: true,
-    dataIndex: 'allMoney',
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
   {
     title: '确收率',
     align: 'center',
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index c718e33..9fc8a68 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -198,6 +198,14 @@ const defaultTableColumns = [
     dataIndex: 'principalName',
     scopedSlots: { customRender: 'text' }
   },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -222,14 +230,7 @@ const defaultTableColumns = [
     dataIndex: 'comeAllMoney',
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同金额',
-    align: 'center',
-    width: 160,
-    sorter: true,
-    dataIndex: 'allMoney',
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
   {
     title: '来款用途',
     align: 'center',
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
index e757dd7..d9f1bb8 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
@@ -172,6 +172,14 @@ const defaultTableColumns = [
     dataIndex: 'workGroup',
     scopedSlots: { customRender: 'text' }
   },
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '确认收入金额',
     align: 'center',
@@ -196,14 +204,7 @@ const defaultTableColumns = [
     dataIndex: 'comeAllMoney',
     scopedSlots: { customRender: 'allMoney' }
   },
-  {
-    title: '合同总金额',
-    align: 'center',
-    width: 160,
-    sorter: true,
-    dataIndex: 'allMoney',
-    scopedSlots: { customRender: 'allMoney' }
-  },
+
   {
     title: '实收完成率',
     align: 'center',