From ed25e3417285180dec672d7958d4783a46d4dbfe Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Sat, 18 Sep 2021 11:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  1 -
 src/components/form/InstallmentForm.vue       |  4 +
 .../modules/ExpenditureContractModule.vue     |  4 +
 .../revenueContract/RevenueContractList.vue   | 10 +-
 .../modules/AssociatedProject.vue             | 20 ++--
 .../ArriveAndInvoivingList.vue                | 14 +--
 src/views/packManagement/PackCompanyList.vue  |  5 +-
 .../packManagement/PackProjectMaintenance.vue |  1 +
 .../modules/BatchInvoicingModule.vue          | 40 +++++++-
 .../WholeInstituteStatisticsList.vue          | 92 ++++++++++++++-----
 .../WorkingGroupPaymentStatisticsDetail.vue   |  3 +-
 .../WorkingGroupPaymentStatisticsList.vue     |  1 +
 12 files changed, 146 insertions(+), 49 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 80de334..d0f5f07 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -37,7 +37,6 @@ const amountReceivedList = (param) => postAction(`/paymentRecord/payPaymentRecor
 // 开票列表
 const payBillList = (param) => postAction(`/paymentRecord/payPaymentRecord/payBillList?id=${ param }`)
 // 新增开票阶段
-// const addPayBill = (projectId, projectType, invoiceAmounts, param) => postAction(`/paymentRecord/payPaymentRecord/addPayBill?projectIds=${projectId}&projectTypes=${projectType}&invoiceAmounts=${invoiceAmounts}`, param)
 const addPayBill = (param) => postAction(`/paymentRecord/payPaymentRecord/addPayBill`, param)
 // 编辑开票阶段
 const editPayBill = (param) => postAction('/paymentRecord/payPaymentRecord/editPayBill', param)
diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue
index 2f11fdf..96f9ff5 100644
--- a/src/components/form/InstallmentForm.vue
+++ b/src/components/form/InstallmentForm.vue
@@ -17,6 +17,7 @@
                      v-decorator="['installmentList['+index+'].accountsReceivableAmount',validatorRules.accountsReceivableAmount]"
                      :maxLength='50'
                      v-bind="$attrs"
+                     @blur="addZero"
                      @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
           </a-form-item>
         </a-col>
@@ -36,6 +37,7 @@
                      v-decorator="['installmentList['+index+'].paidAmount',validatorRules.paidAmount]"
                      :maxLength='50'
                      v-bind="$attrs"
+                     @blur="addZero"
                      @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
           </a-form-item>
         </a-col>
@@ -64,6 +66,7 @@
 <script>
 import JDate from '../tools/JDate'
 import pick from 'lodash.pick'
+import { addZero } from '../../utils/util'
 
 export default {
   name: 'InstallmentForm',
@@ -106,6 +109,7 @@ export default {
     }
   },
   methods: {
+    addZero,
     /**
      * 初始化分期信息列表
      * @param record
diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index c3d1f30..9c051a3 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -432,6 +432,10 @@ export default {
     },
     handleCancle() {
       this.model = {}
+      // 跳转至支出合同list页面
+      this.$router.push({
+        path: '/contractManagement/ExpenditureContract'
+      })
     },
     installmentFormOk(value) {
       this.installmentList = value.installmentList
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index c5561da..386c8c6 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -180,31 +180,31 @@ export default {
           title: '合同编号',
           align: 'center',
           dataIndex: 'contractNum',
-          width: 250,
+          width: 280,
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '合同名称',
           align: 'center',
           dataIndex: 'contractName',
-          width: 250,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '关联项目',
           align: 'center',
           dataIndex: 'associatedProject',
-          width: 250,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '签订单位',
           align: 'center',
           dataIndex: 'signedCompanyTemporaryName',
-          width: 250,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '签订联系人',
           align: 'center',
           dataIndex: 'signedContactsTemporaryName',
-          width: 250,
+          width: 280,
           scopedSlots: { customRender: 'text' }
         }, {
           title: '合同总金额',
diff --git a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
index f8104a6..18c5ac1 100644
--- a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
@@ -13,7 +13,7 @@
       class="j-table-force-nowrap associated-project">
 
       <template slot="text" slot-scope="text">
-        <j-ellipsis :value="text" :length="20"></j-ellipsis>
+        <j-ellipsis :value="text" :length="18"></j-ellipsis>
       </template>
 
       <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
@@ -61,7 +61,8 @@ export default {
           title: '来款项目',
           align: 'center',
           dataIndex: 'chargeProject',
-          width: 250
+          width: 280,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '来款用途',
           align: 'center',
@@ -71,27 +72,32 @@ export default {
           title: '来款单位',
           align: 'center',
           dataIndex: 'chargeCompanyName',
-          width: 250
+          width: 250,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
           dataIndex: 'receivableAmount',
-          width: 250
+          width: 250,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
-          width: 250
+          width: 250,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '负责人',
           align: 'center',
           dataIndex: 'principalName',
-          width: 250
+          width: 250,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '企业联系人',
           align: 'center',
           dataIndex: 'contactsName',
-          width: 250
+          width: 250,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '创建时间',
           align: 'center',
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index bc6838a..f9e0ba3 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -59,7 +59,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1300}"
+          :scroll="{x: 1500}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -173,7 +173,7 @@ export default {
         }, {
           title: '来款项目',
           align: 'center',
-          width: 200,
+          width: 280,
           dataIndex: 'chargeProject',
           scopedSlots: { customRender: 'projectName' }
         }, {
@@ -213,25 +213,25 @@ export default {
         }, {
           title: '打包',
           align: 'center',
-          width: 80,
+          width: 70,
           dataIndex: 'pack',
           scopedSlots: { customRender: 'status-pack' }
         }, {
           title: '到账',
           align: 'center',
-          width: 80,
+          width: 70,
           dataIndex: 'inAccount',
           scopedSlots: { customRender: 'status' }
         }, {
           title: '开票',
           align: 'center',
-          width: 80,
+          width: 70,
           dataIndex: 'makeInvoice',
           scopedSlots: { customRender: 'status' }
         }, {
           title: '邮寄',
           align: 'center',
-          width: 80,
+          width: 70,
           dataIndex: 'mail',
           scopedSlots: { customRender: 'status' }
         }, {
@@ -269,7 +269,7 @@ export default {
     },
     /**
      * 开票
-     * @param id
+     * @param record
      */
     invoicing(record) {
       console.log(record)
diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 813259b..51e1f4e 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -44,7 +44,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1300}"
+          :scroll="{x: 1500}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -108,7 +108,6 @@ export default {
         }, {
           title: '企业名称',
           align: 'center',
-          width: 200,
           dataIndex: 'companyTemporaryName',
           scopedSlots: { customRender: 'projectName' }
         }, {
@@ -126,10 +125,12 @@ export default {
         }, {
           title: '打包费用总计',
           align: 'center',
+          width: 180,
           dataIndex: 'packChargeTotal'
         }, {
           title: '实际到账费用',
           align: 'center',
+          width: 180,
           dataIndex: 'receiptExpense'
         }, {
           title: '打包年份',
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 3f31414..01640c0 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -135,6 +135,7 @@
       ref="batchInvoicingModal"
       :selected-data="selectedProject"
       :visible.sync="batchInvoicingVisible"
+      :pack-contact-id="companyDataById.packContactId"
       @ok="modalFormOk"></batch-invoicing-module>
 
     <!--    来款阶段-->
diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue
index cd0b377..b44b968 100644
--- a/src/views/packManagement/modules/BatchInvoicingModule.vue
+++ b/src/views/packManagement/modules/BatchInvoicingModule.vue
@@ -46,7 +46,27 @@
                 placeholder="请选择邮寄联系人"
                 v-decorator="['postContactId',validatorRules.postContactId]"
                 v-bind="$attrs"
-                :maxLength='50'></select-contacts>
+                :maxLength='50'
+                @change="postContactChange"></select-contacts>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row v-if="isFinancial">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
+              <a-input placeholder="请输入邮政编码"
+                       v-decorator="['postalCode', validatorRules.postalCode]"
+                       :maxLength='6'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              <a class="search-postcode" href="https://www.youbianku.com" target="_blank">查询邮编</a>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="通讯地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入通讯地址"
+                       :maxLength='50'
+                       v-decorator="['contactAddress',validatorRules.contactAddress]"
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -88,6 +108,7 @@ import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
 import { addPayBill } from '../../../api/incomePaymentsApi'
 import SelectContacts from '../../../components/company/SelectContacts'
+import { getContactsById } from '../../../api/api'
 
 export default {
   name: 'BatchInvoicingModule',
@@ -111,11 +132,16 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 打包联系人id
+    packContactId: {
+      type: String,
+      required: false,
+      default: ''
     }
   },
   watch: {
     visible(value) {
-      console.log(value)
       if (value) {
         this.open()
       }
@@ -198,7 +224,6 @@ export default {
       },
       inputInvoicingAmount: null, // 输入的开票金额
       sumAmountOwed: 0 // 总未开票金额
-      // selectedCompany: {} // 企业信息
     }
   },
   methods: {
@@ -276,6 +301,15 @@ export default {
         this.$set(this.dataSource, index, item)
       })
     },
+    /**
+     * 获取联系人信息
+     * @param value
+     */
+    postContactChange(value) {
+      getContactsById({id: value}).then(res => {
+        console.log(res)
+      })
+    },
     handleOk() {
       this.form.validateFields((err, values) => {
         if (!err) {
diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
index fc79834..87f9a2b 100644
--- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue
+++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
@@ -10,17 +10,17 @@
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入来款单位" v-model="queryParam.contractNum"></a-input>
+                <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入来款项目" v-model="queryParam.contractName"></a-input>
+                <a-input placeholder="请输入来款项目" v-model="queryParam.projectName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="项目负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <select-principal placeholder="请选择项目负责人" v-model="queryParam.principalId"></select-principal>
+                <select-principal placeholder="请选择项目负责人" v-model="queryParam.principalNameId"></select-principal>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -41,14 +41,14 @@
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
               <a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入应收款项" v-model="queryParam.contractName" class="query-group-cust"></a-input>
+                <a-input placeholder="请输入应收款项" v-model="queryParam.allMoney" class="query-group-cust"></a-input>
                 <span class="query-group-split-cust"></span>
-                <a-input placeholder="请输入应收款项" v-model="queryParam.contractName" class="query-group-cust"></a-input>
+                <a-input placeholder="请输入应收款项" v-model="queryParam.allMoneyTwo" class="query-group-cust"></a-input>
               </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.paymentDate"></j-year-date>
+                <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -60,9 +60,9 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="付款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.pack"
+                <j-dict-select-tag v-model="queryParam.payStatue"
                                    placeholder="请选择付款状态"
-                                   dictCode="yn"/>
+                                   dictCode="pay_statistics_status"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -95,6 +95,7 @@
           :pagination="ipagination"
           :loading="loading"
           @change="handleTableChange"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           :class="dataSource.length === 0 ? 'show-scroll' : ''"
           class="j-table-force-nowrap main-table">
 
@@ -147,6 +148,7 @@ import { JeroListMixin } from '../../mixins/JeroListMixin'
 import { queryDepartTreeList } from '../../api/api'
 import SelectPrincipal from '../../components/company/SelectPrincipal'
 import JYearDate from '../../components/jero/JYearDate'
+import { getAction } from '../../api/manage'
 
 export default {
   name: 'WholeInstituteStatisticsList',
@@ -178,7 +180,7 @@ export default {
           title: '项目名称',
           align: 'center',
           // width: 200,
-          dataIndex: 'chargeProject',
+          dataIndex: 'projectName',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '负责人',
@@ -190,23 +192,23 @@ export default {
           title: '所属科室',
           align: 'center',
           width: 140,
-          dataIndex: 'departId',
+          dataIndex: 'depart',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
           width: 140,
-          dataIndex: 'receivableAmount'
+          dataIndex: 'allMoney'
         }, {
           title: '实收金额',
           align: 'center',
           width: 140,
-          dataIndex: 'paidAmount'
+          dataIndex: 'comeAllMoney'
         }, {
           title: '来款用途',
           align: 'center',
-          dataIndex: 'chargeUse_dictText',
-          width: 140
+          dataIndex: 'chargeUse_text',
+          width: 150
         }
       ],
       columnsFooter: [
@@ -216,11 +218,11 @@ export default {
           key: 'rowIndex',
           width: 120,
           align: 'center'
-        }, {
+        },  {
           title: '项目名称',
           align: 'center',
           // width: 200,
-          dataIndex: 'chargeProject',
+          dataIndex: 'projectName',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '负责人',
@@ -232,28 +234,29 @@ export default {
           title: '所属科室',
           align: 'center',
           width: 140,
-          dataIndex: 'departId',
+          dataIndex: 'depart',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '应收金额',
           align: 'center',
           width: 140,
-          dataIndex: 'receivableAmount'
+          dataIndex: 'allMoney'
         }, {
           title: '实收金额',
           align: 'center',
           width: 140,
-          dataIndex: 'paidAmount'
+          dataIndex: 'comeAllMoney'
         }, {
           title: '来款用途',
           align: 'center',
-          dataIndex: 'chargeUse_dictText',
-          width: 140
+          dataIndex: 'chargeUse_text',
+          width: 150
         }
       ],
       footerDataSource: [],
       url: {
-        list: ''
+        list: '/statistics/allProjectStatistics/list',
+        exportXlsUrl: '/statistics/allProjectStatistics/statistics/excel'
       }
     }
   },
@@ -300,7 +303,50 @@ export default {
           console.log(res.message)
         }
       })
-    }
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      let params = this.getQueryParams()//查询条件
+      this.loading = true
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records
+          // this.dataSource = res.result.pageList.records
+          let obj = {
+            id: '1',
+            title: '总计',
+            allMoney: res.result.sumOfMoney.toString(),
+            comeAllMoney: res.result.sumOfReallyMoney.toString()
+          }
+          this.footerDataSource = [obj]
+          if (res.result.total) {
+            this.ipagination.total = res.result.total
+            //清空列表选中
+            this.onClearSelected()
+          } else {
+            this.ipagination.total = 0
+          }
+        }
+        if (this.dataSource.length > 0) {
+          this.$nextTick(() => {
+            this.setScroll()
+          })
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      }).finally(() => {
+        this.loading = false
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index a0ca158..7dea9e1 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -76,6 +76,7 @@
           :loading="loading"
           :scroll="{x: 1000}"
           @change="handleTableChange"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           :class="dataSource.length === 0 ? 'show-scroll' : ''"
           class="j-table-force-nowrap main-table">
 
@@ -156,7 +157,7 @@ export default {
           title: '序号',
           dataIndex: '',
           key: 'rowIndex',
-          width: 100,
+          width: 60,
           align: 'center',
           customRender: function (t, r, index) {
             return parseInt(index) + 1
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
index 58f56c4..f361cc7 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
@@ -55,6 +55,7 @@
           :scroll="{x: 1100}"
           @change="handleTableChange"
           :class="dataSource.length === 0 ? 'show-scroll' : ''"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           class="j-table-force-nowrap main-table">
 
           <!--        项目名称-->