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 @@
-
+
-
+
+
+
+
+
+
查询
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',