Merge branch 'wyz' into 'test'

优化8

See merge request !153

src/views/financialCenter/financialBilling.vue

@@ -631,10 +631,11 @@ const rateExchangeConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率3(原币种->港币)
   {
     type: 'input',
     prop: 'originalToHkdRate',
-    label: '汇率3(原币种->港币)',
+    label: '原币种->港币',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -646,10 +647,11 @@ const rateExchangeConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率1(港币->发放币种)
   {
     type: 'input',
     prop: 'hkdToPayoutRate',
-    label: '汇率1(港币->发放币种)',
+    label: '港币->发放币种',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -662,10 +664,11 @@ const rateExchangeConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  //汇率2(保单币种->港币)入账检核汇率
   {
     type: 'input',
     prop: 'exchangeRate',
-    label: '汇率2(保单币种->港币)入账检核汇率',
+    label: '保单币种->港币(入账检核汇率)',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1216,10 +1219,11 @@ const addCheckRecordConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率3(原币种->港币)
   {
     type: 'input',
     prop: 'originalToHkdRate',
-    label: '汇率3(原币种->港币)',
+    label: '原币种->港币',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1231,10 +1235,11 @@ const addCheckRecordConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率1(港币->发放币种)
   {
     type: 'input',
     prop: 'hkdToPayoutRate',
-    label: '汇率1(港币->发放币种)',
+    label: '港币->发放币种',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1247,10 +1252,11 @@ const addCheckRecordConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率2(保单币种->港币)入账检核汇率
   {
     type: 'input',
     prop: 'exchangeRate',
-    label: '汇率2(保单币种->港币)入账检核汇率',
+    label: '保单币种->港币(入账检核汇率)',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1320,6 +1326,7 @@ const handleExport = () => {
 const handleReset = () => {
   // 重置搜索表单
   searchFormRef.value.resetForm()
+  loadTableData()
   console.log('表单已重置')
 }
 const handleQuery = async () => {

src/views/financialCenter/financialIncome.vue

@@ -979,6 +979,7 @@ const handleReset = () => {
   // 重置搜索表单
   searchFormRef.value.resetForm()
   checkFormData.value = {}
+  loadTableData()
   console.log('表单已重置')
 }
 const handleQuery = async () => {
@@ -1133,7 +1134,7 @@ const handleAddCheckList = () => {
   //   }
   //   return item
   // })
-  
+
   addReceivablesFormModel.value = { ...selectedRow.value }
   addCheckRecordDialogFlag.value = true
   clearForm('addReceivablesFormModel')

src/views/financialCenter/payables.vue

@@ -1268,10 +1268,11 @@ const addPayRecordFormConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率3(原币种->港币)
   {
     type: 'input',
     prop: 'originalToHkdRate',
-    label: '汇率3(原币种->港币)',
+    label: '原币种->港币',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1283,10 +1284,11 @@ const addPayRecordFormConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // '汇率1(港币->发放币种)
   {
     type: 'input',
     prop: 'hkdToPayoutRate',
-    label: '汇率1(港币->发放币种)',
+    label: '港币->发放币种',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1
@@ -1299,10 +1301,11 @@ const addPayRecordFormConfig = [
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
   },
+  // 汇率2(保单币种->港币)入账检核汇率
   {
     type: 'input',
     prop: 'defaultExchangeRate',
-    label: '汇率2(保单币种->港币)入账检核汇率',
+    label: '保单币种->港币(入账检核汇率)',
     inputType: 'decimal',
     rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
     // defaultValue: 1