[update] -统计 调整菜单顺序；打包-添加打包项目-增加来款用途 查询项

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>

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',

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',

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',

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',

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',

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: '来款用途',

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',

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',

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',