系统催款，企业管理开户行、银行账号改为选填，项目详情邮寄人字段修改

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
 }

src/components/ProjectDetailModal.vue

@@ -205,7 +205,7 @@ const columns = [
   {
     title: '邮寄人',
     align: 'center',
-    dataIndex: 'liaisonMan',
+    dataIndex: 'contactName',
   },
   {
     title: '快递',

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: {

src/views/system/SystemDept.vue

@@ -5,7 +5,7 @@
       <a-form :form="form" class="form-box">
         <a-form-item label="频率" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag
-            v-decorator="['deptFrequency', validatorRules.deptFrequency]"
+            v-decorator="['frequency', validatorRules.frequency]"
             :triggerChange="true"
             placeholder="请选择频率"
             dictCode="system_dept_frequency"
@@ -17,8 +17,9 @@
           <j-date
             v-if="selectDeptFrequency === '1'"
             placeholder="请选择催款时间"
+            allowClear
             style="width: 100%;"
-            v-decorator="['deptTime', validatorRules.deptTime]"
+            v-decorator="['time', validatorRules.time]"
             :trigger-change="true"
             date-format="YYYY-MM-DD"/>
 
@@ -29,7 +30,7 @@
               <a-select
                 class="select-month"
                 placeholder="请选择月"
-                @change="handleChange"
+                allowClear
                 v-decorator="['deptMonth', validatorRules.deptMonth]"
                 :options="monthOptions">
               </a-select>
@@ -40,7 +41,7 @@
               <a-select
                 style="width: calc(50% - 8px)"
                 placeholder="请选择日"
-                @change="handleChange"
+                allowClear
                 v-decorator="['deptDay', validatorRules.deptDay]"
                 :options="dayOptions">
               </a-select>
@@ -48,8 +49,8 @@
           </div>
         </a-form-item>
         <a-form-item class="btn-form">
-          <a-button type="primary" class="btn-form-save">保存</a-button>
+          <a-button type="primary" class="btn-form-save" @click="handleOk">保存</a-button>
-          <a-button class="btn-form-cancel">取消</a-button>
+          <a-button class="btn-form-cancel" @click="handleCancel">取消</a-button>
         </a-form-item>
       </a-form>
     </a-card>
@@ -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,
+          value: '01',
-          label: 1
+          label: '01'
         }, {
-          value: 2,
+          value: '02',
-          label: 2
+          label: '02'
         }, {
-          value: 3,
+          value: '03',
-          label: 3
+          label: '03'
         }, {
-          value: 4,
+          value: '04',
-          label: 4
+          label: '04'
         }, {
-          value: 5,
+          value: '05',
-          label: 5
+          label: '05'
         }, {
-          value: 6,
+          value: '06',
-          label: 6
+          label: '06'
         }, {
-          value: 7,
+          value: '07',
-          label: 7
+          label: '07'
         }, {
-          value: 8,
+          value: '08',
-          label: 8
+          label: '08'
         }, {
-          value: 9,
+          value: '09',
-          label: 9
+          label: '09'
         }, {
-          value: 10,
+          value: '10',
-          label: 10
+          label: '10'
         }, {
-          value: 11,
+          value: '11',
-          label: 11
+          label: '11'
         }, {
-          value: 12,
+          value: '12',
-          label: 12
+          label: '12'
         }
       ],
       dayOptions: [
         {
-          value: 1,
+          value: '01',
-          label: 1
+          label: '01'
         }, {
-          value: 2,
+          value: '02',
-          label: 2
+          label: '02'
         }, {
-          value: 3,
+          value: '03',
-          label: 3
+          label: '03'
         }, {
-          value: 4,
+          value: '04',
-          label: 4
+          label: '04'
         }, {
-          value: 5,
+          value: '05',
-          label: 5
+          label: '05'
         }, {
-          value: 6,
+          value: '06',
-          label: 6
+          label: '06'
         }, {
-          value: 7,
+          value: '07',
-          label: 7
+          label: '07'
         }, {
-          value: 8,
+          value: '08',
-          label: 8
+          label: '08'
         }, {
-          value: 9,
+          value: '09',
-          label: 9
+          label: '09'
         }, {
-          value: 10,
+          value: '10',
-          label: 10
+          label: '10'
         }, {
-          value: 11,
+          value: '11',
-          label: 11
+          label: '11'
         }, {
-          value: 12,
+          value: '12',
-          label: 12
+          label: '12'
         }, {
-          value: 13,
+          value: '13',
-          label: 13
+          label: '13'
         }, {
-          value: 14,
+          value: '14',
-          label: 14
+          label: '14'
         }, {
-          value: 15,
+          value: '15',
-          label: 15
+          label: '15'
         }, {
-          value: 16,
+          value: '16',
-          label: 16
+          label: '16'
         }, {
-          value: 17,
+          value: '17',
-          label: 17
+          label: '17'
         }, {
-          value: 18,
+          value: '18',
-          label: 18
+          label: '18'
         }, {
-          value: 19,
+          value: '19',
-          label: 19
+          label: '19'
         }, {
-          value: 20,
+          value: '20',
-          label: 20
+          label: '20'
         }, {
-          value: 21,
+          value: '21',
-          label: 21
+          label: '21'
         }, {
-          value: 22,
+          value: '22',
-          label: 22
+          label: '22'
         }, {
-          value: 23,
+          value: '23',
-          label: 23
+          label: '23'
         }, {
-          value: 24,
+          value: '24',
-          label: 24
+          label: '24'
         }, {
-          value: 25,
+          value: '25',
-          label: 25
+          label: '25'
         }, {
-          value: 26,
+          value: '26',
-          label: 26
+          label: '26'
         }, {
-          value: 27,
+          value: '27',
-          label: 27
+          label: '27'
         }, {
-          value: 28,
+          value: '28',
-          label: 28
+          label: '28'
         }, {
-          value: 29,
+          value: '29',
-          label: 29
+          label: '29'
         }, {
-          value: 30,
+          value: '30',
-          label: 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()
     }
   }
 }