Merge branch 'wyz' into 'test'

发布测试

See merge request !141

src/views/financialCenter/financialBilling.vue

@@ -434,9 +434,9 @@ const searchConfig = ref([
     }
     }
   },
   },
   {
   {
-    type: 'daterange',
+    type: 'monthrange',
     prop: 'payoutDate',
     prop: 'payoutDate',
-    label: '出账日（估）',
+    label: '出账月（估）',
     startPlaceholder: '开始时间',
     startPlaceholder: '开始时间',
     endPlaceholder: '结束时间'
     endPlaceholder: '结束时间'
   },
   },
@@ -712,7 +712,7 @@ const confirmRateExchange = async () => {
     rateExchangeFlag.value = false
     rateExchangeFlag.value = false
     loadTableData()
     loadTableData()
   } catch (error) {
   } catch (error) {
-    ElMessage.success('结算汇率修改失败')
+    ElMessage.error('结算汇率修改失败')
     rateExchangeFlag.value = true
     rateExchangeFlag.value = true
     if (error.message && error.message.includes('Validation')) {
     if (error.message && error.message.includes('Validation')) {
       ElMessage.error('必填项不能为空')
       ElMessage.error('必填项不能为空')
@@ -1099,12 +1099,20 @@ const addCheckRecordConfig = [
   },
   },
 
 
   {
   {
-    type: 'date',
+    type: 'month',
     prop: 'payoutDate',
     prop: 'payoutDate',
-    label: '出账日期',
+    label: '出账月(估)',
+    placeholder: '请选择',
+    maxDate: 'today',
+    rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
+  },
+  {
+    type: 'month',
+    prop: 'actualPayoutDate',
+    label: '出账月(实)',
     placeholder: '请选择',
     placeholder: '请选择',
     maxDate: 'today',
     maxDate: 'today',
-    rules: [{ required: true, message: '出账日期必填', trigger: 'blur' }]
+    rules: [{ required: true, message: '出账月(实)必填', trigger: 'blur' }]
   },
   },
   // {
   // {
   //   type: 'input',
   //   type: 'input',

src/views/financialCenter/payables.vue

@@ -156,7 +156,7 @@
         />
         />
         <el-table-column fixed="right" label="操作" min-width="120">
         <el-table-column fixed="right" label="操作" min-width="120">
           <template #default="{ row }">
           <template #default="{ row }">
-            <el-popover placement="right" :width="200" trigger="click">
+            <el-popover placement="right" :width="200" trigger="click" v-if="row.type == '1'">
               <template #reference>
               <template #reference>
                 <el-icon>
                 <el-icon>
                   <MoreFilled />
                   <MoreFilled />
@@ -797,16 +797,16 @@ const updatePayRecordFormConfig = [
     prop: 'fortunePeriod',
     prop: 'fortunePeriod',
     label: '佣金期数',
     label: '佣金期数',
     inputType: 'decimal',
     inputType: 'decimal',
-    visible: formData => formData.fortuneBizType === 'R',
-    rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
+    visible: formData => formData.fortuneBizType === 'R'
+    // rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
   },
   },
   {
   {
     type: 'input',
     type: 'input',
     prop: 'fortuneTotalPeriod',
     prop: 'fortuneTotalPeriod',
     label: '总期数',
     label: '总期数',
     inputType: 'decimal',
     inputType: 'decimal',
-    visible: formData => formData.fortuneBizType === 'R',
-    rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
+    visible: formData => formData.fortuneBizType === 'R'
+    // rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
   },
   },
   {
   {
     type: 'select',
     type: 'select',
@@ -1333,7 +1333,13 @@ const handleConfirmAddPayRecord = async () => {
 const handleConfirmUpdatePayRecord = async () => {
 const handleConfirmUpdatePayRecord = async () => {
   if (selectedRow.value.type == '1') {
   if (selectedRow.value.type == '1') {
     try {
     try {
-      const formData = updatePayRecordFormRef.value.getFormData()
+      const formData = await updatePayRecordFormRef.value.validate()
+      console.log('====================================')
+      console.log('formData', formData)
+      console.log('====================================')
+      if (!formData) {
+        return
+      }
       const params = {
       const params = {
         ...formData,
         ...formData,
         expectedFortuneBizId: selectedRow.value.expectedFortuneBizId
         expectedFortuneBizId: selectedRow.value.expectedFortuneBizId
@@ -1346,7 +1352,10 @@ const handleConfirmUpdatePayRecord = async () => {
       loadPayRecordTableData(selectedRow.value.expectedFortuneBizId)
       loadPayRecordTableData(selectedRow.value.expectedFortuneBizId)
       expectedFortuneListData()
       expectedFortuneListData()
     } catch (error) {
     } catch (error) {
-      ElMessage.error(error.message)
+      if (error.message && error.message.includes('Validation')) {
+        ElMessage.error('必填项不能为空')
+      }
+      ElMessage.error('更新失败')
     }
     }
   }
   }
 }
 }