[update] -确认来款 修改成 确认收入，并默认回显已开票信息

所有统计模块 显示字段名字、顺序的调整、查询条件的修改

src/views/contractManagement/revenueContract/modules/ContractData.js

@@ -204,7 +204,7 @@ let QueryById = {
     'contName': '合同名称',//合同名称
     'contPaid': 0,//已收票金额
     'contPay': 0,//已付款金额
-    'contReve': 0,//已开票金额
+    'contReve': 0,//开票金额
     'contReveInvoc': 0,//待收票金额
     'contSignOurcompName': 'string',//法人公司名称
     'contSignPartnerAName': 'string',//供应商名称

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -143,11 +143,11 @@
                :disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款</a>
             <a @click="invoicing(record)" :disabled="record.needInvoice === 0"
                v-has="'incomePaymentAndInvoiving:invoicing'">开票</a>
-            <!--   确认来款项目--- 普通项目、工作组项目、资料网员 项目 可以确认来款-->
+            <!--   确认收入项目--- 普通项目、工作组项目、资料网员 项目 可以确认收入-->
             <a
               v-has="'incomePaymentAndInvoiving:confirmPayment'"
               @click="preComeMoney(record)"
-            >确认来款</a>
+            >确认收入</a>
           </span>
         </a-table>
       </div>
@@ -186,7 +186,7 @@
     <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
     <!-- 会议审核的弹窗 -->
     <audit-modal ref="auditModal" :meeting-type="meetingType" :situation-id="situationId" @ok="modalFormOk"></audit-modal>
-    <!-- 确认来款 弹窗-->
+    <!-- 确认收入 弹窗-->
     <pre-come-module ref="preComeModule" @ok="modalFormOk"></pre-come-module>
   </div>
 </template>
@@ -486,7 +486,7 @@ export default {
       }
     },
     /**
-     * 确认来款 - 普通项目、工作组项目、资料网员 项目 可以确认来款（即记录跨年度提前来款）
+     * 确认收入 - 普通项目、工作组项目、资料网员 项目 可以确认收入（即记录跨年度提前来款）
      * @param record
      */
     preComeMoney(record) {

src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue

@@ -1,4 +1,4 @@
-<!--提前来款页面 ---即确认来款 模态框 -->
+<!--提前来款页面 ---即确认收入 模态框 -->
 <template>
   <j-modal
     :title="title"
@@ -84,7 +84,7 @@ export default {
     show(record) {
       this.form.resetFields()
       this.projectInfo = Object.assign({}, record)
-      // 通过record 的id 去获取当前项目的确认来款数据
+      // 通过record 的id 去获取当前项目的确认收入数据
       this.getInfoById(record.id)
       this.visible = true
     },
@@ -101,9 +101,11 @@ export default {
           if(this.isEdit) {
             this.edit(res.result[0])
           } else {
+            // 已确认金额 默认回显为 开票金额
+            let amountReceived = this.projectInfo.invoiceAmount
             let currentDate = new Date()
             let text = currentDate.getFullYear() + '-' + (currentDate.getMonth() + 1) + '-' + currentDate.getDate()
-            this.edit({paymentDate: text})
+            this.edit({paymentDate: text, amountReceived})
           }
         } else {
           this.isEdit = false

src/views/statisticalReport/WholeInstituteStatisticsList.vue

@@ -72,8 +72,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -210,188 +210,122 @@
 <script>
 import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
 import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
-import { JeroListMixin } from '../../mixins/JeroListMixin'
-import { getAllDepartTreeList, getUserByDepartCode } from '../../api/incomePaymentsApi'
+import {JeroListMixin} from '../../mixins/JeroListMixin'
+import {getAllDepartTreeList, getUserByDepartCode} from '../../api/incomePaymentsApi'
 import JYearDate from '../../components/jero/JYearDate'
-import { getAction } from '../../api/manage'
+import {getAction} from '../../api/manage'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
-import { downloadFile } from '../../api/manage'
+import {downloadFile} from '../../api/manage'
 import StatusSlot from '../../components/tools/StatusSlot'
 import {formatMoney} from '@/utils/formatMoney'
 
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 60,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '来款项目',
+    align: 'center',
+    width: 280,
+    dataIndex: 'projectName',
+    scopedSlots: {customRender: 'projectName'}
+  },
+  {
+    title: '项目负责人',
+    align: 'center',
+    width: 150,
+    dataIndex: 'principalName',
+    scopedSlots: {customRender: 'text'}
+  },
+  {
+    title: '所属科室',
+    align: 'center',
+    width: 150,
+    dataIndex: 'depart',
+    scopedSlots: {customRender: 'text'}
+  },
+  {
+    title: '来款单位',
+    align: 'center',
+    width: 300,
+    dataIndex: 'chargeCompanyTemporaryName',
+    scopedSlots: {customRender: 'text'}
+  },
+  {
+    title: '是否打包',
+    align: 'center',
+    width: 100,
+    dataIndex: 'pack',
+    scopedSlots: {customRender: 'pack'}
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    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',
+    dataIndex: 'chargeUse_text',
+    width: 150
+  }
+]
+
 export default {
   name: 'WholeInstituteStatisticsList',
-  components: { PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot },
+  components: {PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot},
   mixins: [JeroListMixin],
   data() {
     return {
       IconImg,
       labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
+        xs: {span: 24},
+        sm: {span: 5}
       },
       wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 10 }
+        xs: {span: 24},
+        sm: {span: 10}
       },
       treeDepartData: [],
       replaceFields: {
         value: 'orgCode'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 280,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 150,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '所属科室',
-          align: 'center',
-          width: 150,
-          dataIndex: 'depart',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 150,
-          dataIndex: 'allMoney',
-          sorter: true,
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '实收金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          dataIndex: 'chargeUse_text',
-          width: 150
-        }
-      ],
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          align: 'center',
-          width: 60
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 280,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 150,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '所属科室',
-          align: 'center',
-          width: 150,
-          dataIndex: 'depart',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '实收金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          dataIndex: 'chargeUse_text',
-          width: 150
-        }
-      ],
+      columns: defaultTableColumns,
+      columnsFooter: defaultTableColumns,
       footerDataSource: [],
       // 给定当年作为来款年份默认查询条件
       queryParam: {
@@ -661,7 +595,7 @@ export default {
   }
 }
 
-.table-page-search-submitButtons{
+.table-page-search-submitButtons {
   margin-left: 0;
 }
 </style>

src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue

@@ -15,8 +15,8 @@
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -122,29 +122,15 @@ const defaultTableColumns = [
     scopedSlots: {customRender: 'text'}
   },
   {
-    title: '应收总金额',
+    title: '确认收入金额',
     align: 'center',
-    width: 160,
-    dataIndex: 'allMoney',
-    sorter: true,
-    scopedSlots: {customRender: 'allMoney'}
-  }, {
-    title: '实收总金额',
-    align: 'center',
-    width: 160,
-    dataIndex: 'comeAllMoney',
+    width: 150,
     sorter: true,
+    dataIndex: 'confirmAmount',
     scopedSlots: {customRender: 'allMoney'}
   },
   {
-    title: '到账率',
-    align: 'center',
-    width: 160,
-    dataIndex: 'finishRate',
-    scopedSlots: {customRender: 'text'}
-  },
-  {
-    title: '已开票金额',
+    title: '开票金额',
     align: 'center',
     width: 150,
     sorter: true,
@@ -152,13 +138,29 @@ const defaultTableColumns = [
     scopedSlots: {customRender: 'allMoney'}
   },
   {
-    title: '确认到账金额',
+    title: '到账总金额',
     align: 'center',
-    width: 150,
+    width: 160,
+    dataIndex: 'comeAllMoney',
     sorter: true,
-    dataIndex: 'confirmAmount',
     scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    title: '确收率',
+    align: 'center',
+    width: 160,
+    dataIndex: 'finishRate',
+    scopedSlots: {customRender: 'text'}
   }
+
 ]
 
 export default {

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue

@@ -30,8 +30,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -152,6 +152,79 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import StatusSlot from '../../../components/tools/StatusSlot'
 import {formatMoney} from '@/utils/formatMoney'
 
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 100,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '来款项目',
+    align: 'center',
+    width: 300,
+    dataIndex: 'projectName',
+    scopedSlots: { customRender: 'projectName' }
+  },
+  {
+    title: '来款企业',
+    align: 'center',
+    width: 300,
+    dataIndex: 'chargeCompanyTemporaryName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '是否打包',
+    align: 'center',
+    width: 100,
+    dataIndex: 'pack',
+    scopedSlots: { customRender: 'status-pack' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'comeAllMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '来款用途',
+    align: 'center',
+    width: 160,
+    dataIndex: 'chargeUse_text',
+    scopedSlots: { customRender: 'text' }
+  }
+]
+
 export default {
   name: 'IndividualPaymentStatisticsDetail',
   components: { PageHeaderTitle, JYearDate, ProjectDetailModal, StatusSlot },
@@ -180,136 +253,9 @@ export default {
       filters: {
         principalNameId: this.$route.query.principalId
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 100,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '来款企业',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columns: defaultTableColumns,
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 100,
-          align: 'center'
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'workGroup',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款企业',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_dictText',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columnsFooter: defaultTableColumns,
       // 总计数据
       footerDataSource: []
     }

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue

@@ -46,8 +46,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -146,6 +146,65 @@ import SelectPrincipal from '../../../components/company/SelectPrincipal'
 import { getAllDepartTreeList } from '../../../api/incomePaymentsApi'
 import { getAction } from '@api/manage'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 60,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '项目负责人',
+    align: 'center',
+    width: 300,
+    dataIndex: 'principalName',
+    scopedSlots: { customRender: 'projectName' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账金额',
+    align: 'center',
+    width: 140,
+    dataIndex: 'comeAllMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 140,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: {customRender: 'allMoney'}
+  },
+  {
+    title: '个人完成率',
+    align: 'center',
+    dataIndex: 'finishRate',
+    width: 140
+  },
+
+
+]
 
 export default {
   name: 'IndividualPaymentStatisticsList',
@@ -166,109 +225,8 @@ export default {
       replaceFields: {
         value: 'orgCode'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 140,
-          dataIndex: 'allMoney',
-          sorter: true,
-          scopedSlots: {customRender: 'allMoney'}
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 140,
-          dataIndex: 'comeAllMoney',
-          sorter: true,
-          scopedSlots: {customRender: 'allMoney'}
-        }, {
-          title: '个人完成率',
-          align: 'center',
-          dataIndex: 'finishRate',
-          width: 140
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-      ],
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center'
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        },  {
-          title: '应收金额',
-          align: 'center',
-          width: 140,
-          dataIndex: 'allMoney',
-          sorter: true,
-          scopedSlots: {customRender: 'allMoney'}
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 140,
-          dataIndex: 'comeAllMoney',
-          sorter: true,
-          scopedSlots: {customRender: 'allMoney'}
-        }, {
-          title: '个人完成率',
-          align: 'center',
-          dataIndex: 'finishRate',
-          width: 140
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }
-      ],
+      columns: defaultTableColumns,
+      columnsFooter: defaultTableColumns,
       footerDataSource: [],
       // 给定当年作为来款年份默认查询条件
       queryParam: {

src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue

@@ -48,8 +48,8 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
-              <a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
 <!--            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">-->
@@ -173,6 +173,85 @@ import { getAllDepartTreeList } from '../../../api/incomePaymentsApi'
 import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import StatusSlot from '../../../components/tools/StatusSlot'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 100,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '项目负责人',
+    align: 'center',
+    width: 300,
+    dataIndex: 'principalName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '来款项目',
+    align: 'center',
+    width: 300,
+    dataIndex: 'projectName',
+    scopedSlots: { customRender: 'projectName' }
+  },
+  {
+    title: '来款单位',
+    align: 'center',
+    width: 300,
+    dataIndex: 'chargeCompanyTemporaryName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '是否打包',
+    align: 'center',
+    width: 100,
+    dataIndex: 'pack',
+    scopedSlots: { customRender: 'status-pack' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账金额',
+    align: 'center',
+    width: 160,
+    dataIndex: 'comeAllMoney',
+    sorter: true,
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    dataIndex: 'allMoney',
+    sorter: true,
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '来款用途',
+    align: 'center',
+    width: 160,
+    dataIndex: 'chargeUse_text',
+    scopedSlots: { customRender: 'text' }
+  }
+]
 
 export default {
   name: 'ProjectPaymentStatisticsList',
@@ -193,148 +272,9 @@ export default {
         list: '/statistics/allProjectStatistics/listProject',
         exportXlsUrl: '/statistics/allProjectStatistics/statistics/excelProject'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 100,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        },{
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          dataIndex: 'allMoney',
-          sorter: true,
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          dataIndex: 'comeAllMoney',
-          sorter: true,
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columns: defaultTableColumns,
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 100,
-          align: 'center'
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        },{
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          dataIndex: 'allMoney',
-          sorter: true,
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          dataIndex: 'comeAllMoney',
-          sorter: true,
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columnsFooter: defaultTableColumns,
       // 总计数据
       footerDataSource: [],
       // 给定当年作为来款年份默认查询条件

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue

@@ -30,8 +30,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -154,6 +154,79 @@ import { getAction } from '@api/manage'
 import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import StatusSlot from '../../../components/tools/StatusSlot'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 100,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '来款项目',
+    align: 'center',
+    width: 300,
+    dataIndex: 'projectName',
+    scopedSlots: { customRender: 'projectName' }
+  },
+  {
+    title: '来款企业',
+    align: 'center',
+    width: 300,
+    dataIndex: 'chargeCompanyName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '是否打包',
+    align: 'center',
+    width: 100,
+    dataIndex: 'pack',
+    scopedSlots: { customRender: 'pack' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'comeAllMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+
+  {
+    title: '来款用途',
+    align: 'center',
+    width: 160,
+    dataIndex: 'chargeUse_text',
+    scopedSlots: { customRender: 'text' }
+  }
+]
 
 export default {
   name: 'EnterprisePaymentStatisticsDetail',
@@ -173,137 +246,9 @@ export default {
         list: '/statistics/companyComeMoney/listForDetail',
         exportXlsUrl: '/statistics/companyComeMoney/excelDetail'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 100,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
-          title: '来款企业',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columns: defaultTableColumns,
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 100,
-          align: 'center'
-        }, {
-          title: '来款项目',
-          align: 'center',
-          width: 300,
-          dataIndex: 'projectName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '来款企业',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompany',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'pack' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
-      // 总计数据
+      columnsFooter: defaultTableColumns, // 总计数据
       footerDataSource: [],
       // 给定当年作为来款年份默认查询条件
       queryParam: {

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue

@@ -19,8 +19,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
 
@@ -148,6 +148,72 @@ import { getAction } from '@api/manage'
 import CompanySelect from '@comp/company/CompanySelect'
 import { filterObj } from '../../../utils/util'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 100,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '来款企业',
+    align: 'center',
+    dataIndex: 'chargeCompanyName',
+    scopedSlots: { customRender: 'text' }
+  },
+
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'comeAllMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '确收率',
+    align: 'center',
+    width: 160,
+    dataIndex: 'finishRate',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    align: 'center',
+    fixed: 'right',
+    width: 160,
+    scopedSlots: { customRender: 'action' }
+  }
+]
 
 export default {
   name: 'EnterprisePaymentStatisticsList',
@@ -168,123 +234,9 @@ export default {
         list: '/statistics/companyComeMoney/list',
         exportXlsUrl: '/statistics/companyComeMoney/excel'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 100,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '来款企业',
-          align: 'center',
-          dataIndex: 'chargeCompanyName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '应收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '到账率',
-          align: 'center',
-          width: 160,
-          dataIndex: 'finishRate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 160,
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
+      columns: defaultTableColumns,
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 100,
-          align: 'center'
-        }, {
-          title: '来款企业',
-          align: 'center',
-          dataIndex: 'chargeCompanyName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '应收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '到账率',
-          align: 'center',
-          width: 160,
-          dataIndex: 'finishRate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },{
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 160
-        }
-      ],
+      columnsFooter: defaultTableColumns,
       // 总计数据
       footerDataSource: [],
       // 给定当年作为来款年份默认查询条件

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue

@@ -36,8 +36,8 @@
               </a-form-item>
             </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.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
 
@@ -170,6 +170,74 @@ import JYearDate from '../../../components/jero/JYearDate'
 import { getAction } from '../../../api/manage'
 import StatusSlot from '../../../components/tools/StatusSlot'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: 'title',
+    width: 60,
+    align: 'center'
+  },
+  {
+    title: '来款单位',
+    align: 'center',
+    width: 300,
+    dataIndex: 'chargeCompanyTemporaryName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '是否打包',
+    align: 'center',
+    width: 100,
+    dataIndex: 'pack',
+    scopedSlots: { customRender: 'status-pack' }
+  },
+  {
+    title: '项目负责人',
+    align: 'center',
+    width: 300,
+    dataIndex: 'principalName',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'comeAllMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '来款用途',
+    align: 'center',
+    width: 160,
+    dataIndex: 'chargeUse_text',
+    scopedSlots: { customRender: 'text' }
+  }
+]
 
 export default {
   name: 'WorkingGroupPaymentStatisticsDetail',
@@ -190,73 +258,7 @@ export default {
         list: '/project/payWorkingGroupStatistics/listSub',
         exportXlsUrl: '/project/payWorkingGroupStatistics/excelSub'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columns: defaultTableColumns,
       dataSource: [
         {
           id: 1,
@@ -266,68 +268,7 @@ export default {
         }
       ],
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 60,
-          align: 'center'
-        }, {
-          title: '来款单位',
-          align: 'center',
-          width: 300,
-          dataIndex: 'chargeCompanyTemporaryName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '是否打包',
-          align: 'center',
-          width: 100,
-          dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
-        }, {
-          title: '项目负责人',
-          align: 'center',
-          width: 300,
-          dataIndex: 'principalName',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '应收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '来款用途',
-          align: 'center',
-          width: 160,
-          dataIndex: 'chargeUse_text',
-          scopedSlots: { customRender: 'text' }
-        }
-      ],
+      columnsFooter: defaultTableColumns,
       // 总计数据
       footerDataSource: [],
       filters: {

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue

@@ -18,8 +18,8 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
-              <a-form-item label="开票年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-year-date style="width:100%" placeholder="请选择开票年份" v-model="queryParam.billYear"></j-year-date>
+              <a-form-item label="确认年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择确认年份" v-model="queryParam.paymentYear"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -155,6 +155,72 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import JYearDate from '../../../components/jero/JYearDate'
 import { getAction } from '../../../api/manage'
 import {formatMoney} from '@/utils/formatMoney'
+const defaultTableColumns = [
+  {
+    title: '序号',
+    dataIndex: '',
+    key: 'rowIndex',
+    width: 100,
+    align: 'center',
+    customRender: function (t, r, index) {
+      return parseInt(index) + 1
+    }
+  },
+  {
+    title: '工作组',
+    align: 'center',
+    dataIndex: 'workGroup',
+    scopedSlots: { customRender: 'text' }
+  },
+  {
+    title: '确认收入金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '开票金额',
+    align: 'center',
+    width: 150,
+    sorter: true,
+    dataIndex: 'billMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '到账总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'comeAllMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '合同总金额',
+    align: 'center',
+    width: 160,
+    sorter: true,
+    dataIndex: 'allMoney',
+    scopedSlots: { customRender: 'allMoney' }
+  },
+  {
+    title: '实收完成率',
+    align: 'center',
+    width: 160,
+    dataIndex: 'moneyRate',
+    scopedSlots: { customRender: 'text' }
+  },
+
+  {
+    title: '操作',
+    dataIndex: 'action',
+    align: 'center',
+    fixed: 'right',
+    width: 160,
+    scopedSlots: { customRender: 'action' }
+  }
+]
 
 export default {
   name: 'WorkingGroupPaymentStatisticsList',
@@ -175,124 +241,10 @@ export default {
         list: '/project/payWorkingGroupStatistics/list',
         exportXlsUrl: '/project/payWorkingGroupStatistics/exportXls2'
       },
-      columns: [
-        {
-          title: '序号',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 100,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          }
-        }, {
-          title: '工作组',
-          align: 'center',
-          dataIndex: 'workGroup',
-          scopedSlots: { customRender: 'text' }
-        }, {
-          title: '应收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收完成率',
-          align: 'center',
-          width: 160,
-          dataIndex: 'moneyRate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 160,
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
+      columns: defaultTableColumns,
       dataSource: [],
       // 总计表头，与主表表头一致
-      columnsFooter: [
-        {
-          title: '序号',
-          dataIndex: 'title',
-          width: 100,
-          align: 'center'
-        }, {
-          title: '工作组',
-          align: 'center',
-          dataIndex: 'workGroup',
-          scopedSlots: { customRender: 'text' }
-        },  {
-          title: '应收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'allMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收总金额',
-          align: 'center',
-          width: 160,
-          sorter: true,
-          dataIndex: 'comeAllMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '实收完成率',
-          align: 'center',
-          width: 160,
-          dataIndex: 'moneyRate',
-          scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: '已开票金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'billMoney',
-          scopedSlots: { customRender: 'allMoney' }
-        },
-        {
-          title: '确认到账金额',
-          align: 'center',
-          width: 150,
-          sorter: true,
-          dataIndex: 'confirmAmount',
-          scopedSlots: { customRender: 'allMoney' }
-        }, {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 160
-        }
-      ],
+      columnsFooter: defaultTableColumns,
       // 给定当年作为来款年份默认查询条件
       queryParam: {
         year: new Date().getFullYear().toString()