From 524ade2654505fa114198e2dd2e7d2f9b04dd7d8 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 25 Dec 2023 15:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E3=80=81=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E3=80=81=E8=B5=84=E6=96=99=E7=BD=91?=
 =?UTF-8?q?=E5=91=98=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=90=E9=A2=84?=
 =?UTF-8?q?=E4=BC=B0=E5=88=B0=E8=B4=A6=E6=97=A5=E6=9C=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../memberManage/SafeguardMemberList.vue      | 50 ++++++++++++++++++-
 .../modules/SafeguardMemberModal.vue          | 19 ++++++-
 .../GeneralProjectManagement.vue              | 24 ++++++++-
 .../WorkingGroupMemberUnitMaintenance.vue     | 47 ++++++++++++++---
 .../modules/GeneralProjectModule.vue          | 25 ++++++++--
 .../modules/WorkingGroupMemberUnitModule.vue  | 19 ++++++-
 6 files changed, 165 insertions(+), 19 deletions(-)

diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index 0cd2b29..3d13207 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -47,6 +47,17 @@
               <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">
+            <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                style="width: 100%"
+                v-model="queryParam.estimatedArrivalDate"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+              />
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search" v-has="'safeguardMember:search'">查询</a-button>
@@ -80,6 +91,7 @@
         bordered
         rowKey="id"
         :columns="columns"
+        :scroll="{x: 1500}"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
@@ -88,12 +100,22 @@
         @change="handleTableChange">
 
         <template slot="text" slot-scope="text">
-          <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
-          <span v-else></span>
+          <a-tooltip>
+            <template slot="title">{{ text }}</template>
+            <div class="table-text">{{ text }}</div>
+          </a-tooltip>
         </template>
+
         <template slot="member" slot-scope="text,record">
           <div @click="openDetail(record)" class="primary-color">{{ text }}</div>
         </template>
+        <!--金钱 3位一逗号分隔-->
+        <template slot="allMoney" slot-scope="text">
+          <a-tooltip>
+            <template slot="title">{{ formatMoney(text) }}</template>
+            <div class="table-text">{{ formatMoney(text) }}</div>
+          </a-tooltip>
+        </template>
 
         <template slot="status" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
@@ -136,6 +158,7 @@ import ProjectDetailModal from '@comp/ProjectDetailModal'
 import StatusSlot from '@comp/tools/StatusSlot'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import PreviewFile from '@comp/jero/PreviewFile'
+import { formatMoney } from '@/utils/formatMoney'
 
 
 import {getAction} from '@api/manage'
@@ -175,51 +198,69 @@ export default {
         {
           title: '企业联系人',
           align: 'center',
+          width: 120,
           dataIndex: 'companyContactName',
         },
         {
           title: '待确收金额',
           align: 'center',
+          width: 140,
           dataIndex: 'amountReceivable',
+          scopedSlots: {customRender: 'allMoney'}
         },
         {
           title: '实收金额',
           align: 'center',
+          width: 140,
           dataIndex: 'paidAmount',
+          scopedSlots: {customRender: 'allMoney'}
+        },
+        {
+          title: '预估到账日期',
+          align: 'center',
+          width: 140,
+          dataIndex: 'estimatedArrivalDate',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '打包',
           align: 'center',
+          width: 80,
           dataIndex: 'pack',
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '需要发票',
           align: 'center',
+          width: 80,
           dataIndex: 'needInvoice',
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '到账',
           align: 'center',
+          width: 80,
           dataIndex: 'inAccount',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '开票',
           align: 'center',
+          width: 80,
           dataIndex: 'makeInvoice',
           scopedSlots: {customRender: 'status-bill'}
         },
         {
           title: '邮寄',
           align: 'center',
+          width: 80,
           dataIndex: 'mail',
           scopedSlots: {customRender: 'status-mail'}
         },
         {
           title: '操作',
           align: 'center',
+          width: 180,
           dataIndex: '',
           scopedSlots: {customRender: 'action'}
         },
@@ -252,6 +293,7 @@ export default {
     this.getChargeNoFile()
   },
   methods: {
+    formatMoney,
     /*
     *  打开项目详情模态框
     * */
@@ -302,6 +344,10 @@ export default {
           this.currentInfo.fileName = res.result.fileName
         }
       })
+    },
+    onDateChange: function (value, dateString) {
+      this.queryParam.estimatedArrivalStartDate = dateString[0]
+      this.queryParam.estimatedArrivalEndDate = dateString[1]
     }
   }
 }
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 2bbe527..4f179d8 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -132,6 +132,16 @@
           </a-col>
         </a-row>
         <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择预估到账日期"
+                      style="width: 100%;"
+                      v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
+                      :trigger-change="true"
+                      date-format="YYYY-MM-DD"
+              />
+            </a-form-item>
+          </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item
               label="需要发票"
@@ -274,12 +284,14 @@ import { checkAssociatedProject } from '@/utils/projectCheck'
 import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import {CalcAmountMixin} from '@/mixins/CalcAmountMixin'
+import JDate from '@/components/tools/JDate'
 
 export default {
   name: 'SafeguardMemberModal',
   mixins:[CalcAmountMixin],
   components: {
     JUpload,
+    JDate,
     JDictSelectTag,
     CompanySelect,
     // ContactManagementModule,
@@ -290,7 +302,7 @@ export default {
     return {
       title: '操作',
       ysjeKey:'amountReceivable',
-      width: 800,
+      width: 900,
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
@@ -352,6 +364,10 @@ export default {
           rules: [{ required: true, message: '请选择发票类型' }],
           validateTrigger: ['change', 'blur'],
           initialValue: 0
+        },
+        estimatedArrivalDate: {
+          rules: [{ required: true, message: '请选择预估到账日期' }],
+          validateTrigger: 'change'
         }
       },
       // 来款方式
@@ -448,6 +464,7 @@ export default {
             'taxRate',
             'tax',
             'noTaxAmount',
+            'estimatedArrivalDate',
             'needInvoice',
             'paymentMethod',
             'contractNo',
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index c4801ea..bfb9f8e 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -42,6 +42,17 @@
                 <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">
+              <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-range-picker
+                  style="width: 100%"
+                  v-model="queryParam.estimatedArrivalDate"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                />
+              </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" v-has="'generalProject:search'">查询</a-button>
@@ -85,6 +96,7 @@
           <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="15"></j-ellipsis>
           </template>
+          <!--金钱 3位一逗号分隔-->
           <template slot="allMoney" slot-scope="text">
             <a-tooltip>
               <template slot="title">{{ formatMoney(text) }}</template>
@@ -208,9 +220,15 @@ export default {
         }, {
           title: '企业联系人',
           align: 'center',
-          width: 250,
+          width: 140,
           dataIndex: 'contactsTemporaryName',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '预估到账日期',
+          align: 'center',
+          width: 140,
+          dataIndex: 'estimatedArrivalDate',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '打包',
           align: 'center',
@@ -270,6 +288,10 @@ export default {
       }
       this.$refs.basicInfo = basicInfo
       this.$refs.projectDetail.open(record)
+    },
+    onDateChange: function (value, dateString) {
+      this.queryParam.estimatedArrivalStartDate = dateString[0]
+      this.queryParam.estimatedArrivalEndDate = dateString[1]
     }
   }
 }
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 5483dae..b0ea68f 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -70,6 +70,17 @@
                 <a-input placeholder="请输入标签名称" v-model="queryParam.label" :maxLength='50'></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-range-picker
+                  style="width: 100%"
+                  v-model="queryParam.estimatedArrivalDate"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onDateChange"
+                />
+              </a-form-item>
+            </a-col>
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
@@ -135,7 +146,13 @@
                         class="primary-color"
                         @click="openDetailModal(record)"></j-ellipsis>
           </template>
-
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
           <!--        打包、需要发票、到账、开票、邮寄状态-->
           <template slot="status" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
@@ -185,7 +202,7 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
-import { getWorkingGroupById, getChargeNotice, dunningReminder } from '@api/incomePaymentsApi'
+import { getWorkingGroupById, dunningReminder } from '@api/incomePaymentsApi'
 import StatusSlot from '../../components/tools/StatusSlot'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
 import WorkingGroupMemberUnitModule from './modules/WorkingGroupMemberUnitModule'
@@ -195,6 +212,7 @@ import { ACCESS_TOKEN } from '../../store/mutation-types'
 import PreviewFile from '../../components/jero/PreviewFile'
 import EmailErrorMsgModal from './modules/EmailErrorMsgModal'
 import WorkGroupSetLabel from './modules/WorkGroupSetLabel'
+import { formatMoney } from '../../utils/formatMoney'
 
 // eslint-disable-next-line no-undef,no-unused-vars
 const Base64 = require('js-base64').Base64
@@ -303,23 +321,31 @@ export default {
           align: 'center',
           dataIndex: 'receivableAmount',
           width: 180,
-          customRender: (text, record) => (
-            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
-          )
+          scopedSlots: {customRender: 'allMoney'},
+          // customRender: (text, record) => (
+          //   <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
+          // )
         }, {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
           width: 180,
-          customRender: (text, record) => (
-            <j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>
-          )
+          scopedSlots: {customRender: 'allMoney'},
+          // customRender: (text, record) => (
+          //   <j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>
+          // )
         }, {
           title: '标签名称',
           align: 'center',
           dataIndex: 'label',
           width: 100,
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '预估到账日期',
+          align: 'center',
+          width: 140,
+          dataIndex: 'estimatedArrivalDate',
+          scopedSlots: { customRender: 'text' }
         }, {
           // 2021-10-22需求变更新加
           title: '收费通知号',
@@ -389,6 +415,7 @@ export default {
     this.initWorkGroupData()
   },
   methods: {
+    formatMoney,
     /**
      * 初始化工作组信息
      */
@@ -546,6 +573,10 @@ export default {
         return
       }
       this.$refs.workGroupSetLabel.show(this.selectedRowKeys)
+    },
+    onDateChange: function (value, dateString) {
+      this.queryParam.estimatedArrivalStartDate = dateString[0]
+      this.queryParam.estimatedArrivalEndDate = dateString[1]
     }
     // 2021 10 11 沟通后去掉了这个功能
     // searchReset() {
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 4b16544..4c3e00a 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -140,7 +140,18 @@
           </a-col>
 
         </a-row>
-
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择预估到账日期"
+                      style="width: 100%;"
+                      v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
+                      :trigger-change="true"
+                      date-format="YYYY-MM-DD"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -243,10 +254,11 @@ import { USER_INFO } from '../../../store/mutation-types'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
 import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
+import JDate from '@/components/tools/JDate'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract ,JDictSelectTag},
+  components: { JYearDate, JUpload, JDate,CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract ,JDictSelectTag},
   props: {
     // 收入合同关联时传入的企业信息，不可修改
     defaultChargeCompany: {
@@ -302,7 +314,7 @@ export default {
   data() {
     return {
       title: '操作',
-      width: 800,
+      width: 900,
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
@@ -367,7 +379,10 @@ export default {
           rules: [{ required: false, validator: this.checkNoTaxMoney}],
           validateTrigger: 'blur'
         },
-
+        estimatedArrivalDate: {
+          rules: [{ required: true, message: '请选择预估到账日期' }],
+          validateTrigger: 'change'
+        },
         needInvoice: {
           rules: [{ required: true, message: '请选择发票类型' }],
           validateTrigger: 'change'
@@ -461,7 +476,7 @@ export default {
       this.chargeWayType = record.chargeWay
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompany', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount','taxRate','tax','noTaxAmount', 'needInvoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'chargeNoticeId', 'files', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompany', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount','taxRate','tax','noTaxAmount', 'estimatedArrivalDate', 'needInvoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'chargeNoticeId', 'files', 'remarks'))
       })
     },
     close() {
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 93e5562..6d0f271 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -243,6 +243,16 @@
 
         </template>
         <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择预估到账日期"
+                      style="width: 100%;"
+                      v-decorator="['estimatedArrivalDate', validatorRules.estimatedArrivalDate]"
+                      :trigger-change="true"
+                      date-format="YYYY-MM-DD"
+              />
+            </a-form-item>
+          </a-col>
           <a-col :xl="12" :sm="24" v-if="chargeWayType === 2">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <!--              <a-input placeholder="请输入合同号"-->
@@ -395,10 +405,11 @@ import { checkAssociatedProject } from '../../../utils/projectCheck'
 import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
+import JDate from '@/components/tools/JDate'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JUpload, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
+  components: { JUpload, JDate, CompanySelect, SelectContacts, SelectRevenueContract, JDictSelectTag },
   mixins: [CalcAmountMixin],
   props: {
     // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
@@ -503,6 +514,10 @@ export default {
           rules: [{ required: true, validator: this.checkMoney }],
           validateTrigger: 'blur'
         },
+        estimatedArrivalDate: {
+          rules: [{ required: true, message: '请选择预估到账日期' }],
+          validateTrigger: 'change'
+        },
         contractNum: {
           rules: [{ required: true, message: '请选择合同号' }],
           validateTrigger: 'change'
@@ -651,7 +666,7 @@ export default {
       this.pickChargeNoticeType(record.charge, true)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'taxRate', 'tax', 'noTaxAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payWorkingGroupSubItemContactsList'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'taxRate', 'tax', 'noTaxAmount', 'estimatedArrivalDate', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payWorkingGroupSubItemContactsList'))
       })
     },
     close() {