Skip to content

Y
yd-csf-front
Commit b47d0fb2 by yuzhenWang
Options

Merge branch 'wyz' into 'test' 

优化8

See merge request !153
parents 6dcdecbc 2fd9258c
Showing with 21 additions and 10 deletions
src/views/financialCenter/financialBilling.vue
...@@ -631,10 +631,11 @@ const rateExchangeConfig = [ ...@@ -631,10 +631,11 @@ const rateExchangeConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率3(原币种->港币)
{ {
type: 'input', type: 'input',
prop: 'originalToHkdRate', prop: 'originalToHkdRate',
label: '汇率3(原币种->港币)', label: '原币种->港币',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -646,10 +647,11 @@ const rateExchangeConfig = [ ...@@ -646,10 +647,11 @@ const rateExchangeConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率1(港币->发放币种)
{ {
type: 'input', type: 'input',
prop: 'hkdToPayoutRate', prop: 'hkdToPayoutRate',
label: '汇率1(港币->发放币种)', label: '港币->发放币种',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -662,10 +664,11 @@ const rateExchangeConfig = [ ...@@ -662,10 +664,11 @@ const rateExchangeConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
//汇率2(保单币种->港币)入账检核汇率
{ {
type: 'input', type: 'input',
prop: 'exchangeRate', prop: 'exchangeRate',
label: '汇率2(保单币种->港币)入账检核汇率', label: '保单币种->港币(入账检核汇率)',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1216,10 +1219,11 @@ const addCheckRecordConfig = [ ...@@ -1216,10 +1219,11 @@ const addCheckRecordConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率3(原币种->港币)
{ {
type: 'input', type: 'input',
prop: 'originalToHkdRate', prop: 'originalToHkdRate',
label: '汇率3(原币种->港币)', label: '原币种->港币',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1231,10 +1235,11 @@ const addCheckRecordConfig = [ ...@@ -1231,10 +1235,11 @@ const addCheckRecordConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率1(港币->发放币种)
{ {
type: 'input', type: 'input',
prop: 'hkdToPayoutRate', prop: 'hkdToPayoutRate',
label: '汇率1(港币->发放币种)', label: '港币->发放币种',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1247,10 +1252,11 @@ const addCheckRecordConfig = [ ...@@ -1247,10 +1252,11 @@ const addCheckRecordConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率2(保单币种->港币)入账检核汇率
{ {
type: 'input', type: 'input',
prop: 'exchangeRate', prop: 'exchangeRate',
label: '汇率2(保单币种->港币)入账检核汇率', label: '保单币种->港币(入账检核汇率)',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1320,6 +1326,7 @@ const handleExport = () => { ...@@ -1320,6 +1326,7 @@ const handleExport = () => {
const handleReset = () => { const handleReset = () => {
// 重置搜索表单 // 重置搜索表单
searchFormRef.value.resetForm() searchFormRef.value.resetForm()
loadTableData()
console.log('表单已重置') console.log('表单已重置')
} }
const handleQuery = async () => { const handleQuery = async () => {
......
src/views/financialCenter/financialIncome.vue
...@@ -979,6 +979,7 @@ const handleReset = () => { ...@@ -979,6 +979,7 @@ const handleReset = () => {
// 重置搜索表单 // 重置搜索表单
searchFormRef.value.resetForm() searchFormRef.value.resetForm()
checkFormData.value = {} checkFormData.value = {}
loadTableData()
console.log('表单已重置') console.log('表单已重置')
} }
const handleQuery = async () => { const handleQuery = async () => {
...@@ -1133,7 +1134,7 @@ const handleAddCheckList = () => { ...@@ -1133,7 +1134,7 @@ const handleAddCheckList = () => {
// } // }
// return item // return item
// }) // })
addReceivablesFormModel.value = { ...selectedRow.value } addReceivablesFormModel.value = { ...selectedRow.value }
addCheckRecordDialogFlag.value = true addCheckRecordDialogFlag.value = true
clearForm('addReceivablesFormModel') clearForm('addReceivablesFormModel')
......
src/views/financialCenter/payables.vue
...@@ -1268,10 +1268,11 @@ const addPayRecordFormConfig = [ ...@@ -1268,10 +1268,11 @@ const addPayRecordFormConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率3(原币种->港币)
{ {
type: 'input', type: 'input',
prop: 'originalToHkdRate', prop: 'originalToHkdRate',
label: '汇率3(原币种->港币)', label: '原币种->港币',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1283,10 +1284,11 @@ const addPayRecordFormConfig = [ ...@@ -1283,10 +1284,11 @@ const addPayRecordFormConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// '汇率1(港币->发放币种)
{ {
type: 'input', type: 'input',
prop: 'hkdToPayoutRate', prop: 'hkdToPayoutRate',
label: '汇率1(港币->发放币种)', label: '港币->发放币种',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
...@@ -1299,10 +1301,11 @@ const addPayRecordFormConfig = [ ...@@ -1299,10 +1301,11 @@ const addPayRecordFormConfig = [
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
}, },
// 汇率2(保单币种->港币)入账检核汇率
{ {
type: 'input', type: 'input',
prop: 'defaultExchangeRate', prop: 'defaultExchangeRate',
label: '汇率2(保单币种->港币)入账检核汇率', label: '保单币种->港币(入账检核汇率)',
inputType: 'decimal', inputType: 'decimal',
rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }] rules: [{ required: true, message: '只能输入正整数和小数', trigger: 'blur' }]
// defaultValue: 1 // defaultValue: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment