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 @@
+
+
+
+
+
查询
@@ -80,6 +91,7 @@
bordered
rowKey="id"
:columns="columns"
+ :scroll="{x: 1500}"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@@ -88,12 +100,22 @@
@change="handleTableChange">
-
-
+
+ {{ text }}
+ {{ text }}
+
+
{{ text }}
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
@@ -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 @@
+
+
+
+
+
+
+
+
+
+
查询
@@ -85,6 +96,7 @@
+
{{ formatMoney(text) }}
@@ -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 @@
+
+
+
+
+
@@ -135,7 +146,13 @@
class="primary-color"
@click="openDetailModal(record)">
-
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
@@ -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) => (
-
- )
+ scopedSlots: {customRender: 'allMoney'},
+ // customRender: (text, record) => (
+ //
+ // )
}, {
title: '实收金额',
align: 'center',
dataIndex: 'paidAmount',
width: 180,
- customRender: (text, record) => (
-
- )
+ scopedSlots: {customRender: 'allMoney'},
+ // customRender: (text, record) => (
+ //
+ // )
}, {
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 @@
-
+
+
+
+
+
+
+
@@ -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 @@
+
+
+
+
+
@@ -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() {