From 934e6f6e66b7c3740f6a1b4e38cf74319fee3b47 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 28 Sep 2021 11:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=82=AC=E6=AC=BE=EF=BC=8C?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=E5=BC=80=E6=88=B7=E8=A1=8C?= =?UTF-8?q?=E3=80=81=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=89=E5=A1=AB=EF=BC=8C=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=82=AE=E5=AF=84=E4=BA=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 5 +- src/components/ProjectDetailModal.vue | 2 +- .../modules/BusinessManagementModule.vue | 4 +- src/views/system/SystemDept.vue | 222 ++++++++++-------- 4 files changed, 137 insertions(+), 96 deletions(-) diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 6410f12..85d7555 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -68,6 +68,8 @@ const checkoutWorkingGroupPrincipal = (param) => getAction('/project/payWorkingG const homePageStatistics = (param) => getAction('/statistics/principalPeople/firstPage', param) // 首页数据统计 const homePageDataStatistics = (param) => getAction('/home/dataStatistics', param) +// 系统催款 +const sysReminders = (param) => postAction('/reminders/edit', param) export { getWorkingGroupById, @@ -103,5 +105,6 @@ export { copyWorkingGroup, checkoutWorkingGroupPrincipal, homePageStatistics, - homePageDataStatistics + homePageDataStatistics, + sysReminders } diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 739ea2e..92f2de1 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -205,7 +205,7 @@ const columns = [ { title: '邮寄人', align: 'center', - dataIndex: 'liaisonMan', + dataIndex: 'contactName', }, { title: '快递', diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index d01951d..8bf57d2 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -169,11 +169,11 @@ export default { validateTrigger: 'blur' }, bankAccountName: { - rules: [{ required: true, message: '请输入银行户名' }], + rules: [{ required: false, message: '请输入银行户名' }], validateTrigger: 'blur' }, openingBank: { - rules: [{ required: true, message: '请输入开户行' }], + rules: [{ required: false, message: '请输入开户行' }], validateTrigger: 'blur' }, bankAccount: { diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue index bee65e8..9228a38 100644 --- a/src/views/system/SystemDept.vue +++ b/src/views/system/SystemDept.vue @@ -5,7 +5,7 @@ @@ -29,7 +30,7 @@ @@ -40,7 +41,7 @@ @@ -48,8 +49,8 @@ - 保存 - 取消 + 保存 + 取消 @@ -60,6 +61,8 @@ import JDate from '../../components/tools/JDate' import IconImg from '@/assets/imgs/icon/icon_system.png' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' +import pick from 'lodash.pick' +import { sysReminders } from '../../api/incomePaymentsApi' export default { name: 'SystemDept', @@ -98,134 +101,134 @@ export default { selectDeptFrequency: '1', // 选中的提示频率 monthOptions: [ { - value: 1, - label: 1 + value: '01', + label: '01' }, { - value: 2, - label: 2 + value: '02', + label: '02' }, { - value: 3, - label: 3 + value: '03', + label: '03' }, { - value: 4, - label: 4 + value: '04', + label: '04' }, { - value: 5, - label: 5 + value: '05', + label: '05' }, { - value: 6, - label: 6 + value: '06', + label: '06' }, { - value: 7, - label: 7 + value: '07', + label: '07' }, { - value: 8, - label: 8 + value: '08', + label: '08' }, { - value: 9, - label: 9 + value: '09', + label: '09' }, { - value: 10, - label: 10 + value: '10', + label: '10' }, { - value: 11, - label: 11 + value: '11', + label: '11' }, { - value: 12, - label: 12 + value: '12', + label: '12' } ], dayOptions: [ { - value: 1, - label: 1 + value: '01', + label: '01' }, { - value: 2, - label: 2 + value: '02', + label: '02' }, { - value: 3, - label: 3 + value: '03', + label: '03' }, { - value: 4, - label: 4 + value: '04', + label: '04' }, { - value: 5, - label: 5 + value: '05', + label: '05' }, { - value: 6, - label: 6 + value: '06', + label: '06' }, { - value: 7, - label: 7 + value: '07', + label: '07' }, { - value: 8, - label: 8 + value: '08', + label: '08' }, { - value: 9, - label: 9 + value: '09', + label: '09' }, { - value: 10, - label: 10 + value: '10', + label: '10' }, { - value: 11, - label: 11 + value: '11', + label: '11' }, { - value: 12, - label: 12 + value: '12', + label: '12' }, { - value: 13, - label: 13 + value: '13', + label: '13' }, { - value: 14, - label: 14 + value: '14', + label: '14' }, { - value: 15, - label: 15 + value: '15', + label: '15' }, { - value: 16, - label: 16 + value: '16', + label: '16' }, { - value: 17, - label: 17 + value: '17', + label: '17' }, { - value: 18, - label: 18 + value: '18', + label: '18' }, { - value: 19, - label: 19 + value: '19', + label: '19' }, { - value: 20, - label: 20 + value: '20', + label: '20' }, { - value: 21, - label: 21 + value: '21', + label: '21' }, { - value: 22, - label: 22 + value: '22', + label: '22' }, { - value: 23, - label: 23 + value: '23', + label: '23' }, { - value: 24, - label: 24 + value: '24', + label: '24' }, { - value: 25, - label: 25 + value: '25', + label: '25' }, { - value: 26, - label: 26 + value: '26', + label: '26' }, { - value: 27, - label: 27 + value: '27', + label: '27' }, { - value: 28, - label: 28 + value: '28', + label: '28' }, { - value: 29, - label: 29 + value: '29', + label: '29' }, { - value: 30, - label: 30 + value: '30', + label: '30' } ] } @@ -233,10 +236,45 @@ export default { methods: { deptFrequencyChange(value) { this.selectDeptFrequency = value || '1' + let obj = { + time: undefined, + deptMonth: undefined, + deptDay: undefined + } + this.form.setFieldsValue(pick(obj, 'time', 'deptMonth', 'deptDay')) console.log(typeof this.selectDeptFrequency, this.selectDeptFrequency) }, - handleChange() { - + handleOk() { + this.form.validateFields((err, values) => { + if (!err) { + let formData = {} + console.log(values) + switch (values.frequency) { + case '1': + formData.time = values.time + break + case '2': + formData.time = values.deptMonth + '-' + values.deptDay + break + case '3': + formData.time = values.deptDay + break + } + formData.frequency = Number(values.frequency) + console.log('表单提交数据', formData) + sysReminders(formData).then(res => { + if (res.success) { + this.$message.success(res.message) + this.form.resetFields() + } else { + this.$message.warn(res.message) + } + }) + } + }) + }, + handleCancel() { + this.form.resetFields() } } }