Merge branch 'wyz' into 'test'

修复新增汇款bug

See merge request !122

src/utils/number.js

@@ -229,9 +229,7 @@ export function calculateAmount(a, b, digits = 2, type) {
     }
     // 四舍五入到指定位数，并转为 Number（若需要字符串可用 .toFixed(digits)）
     // return result.toDecimalPlaces(digits, Decimal.ROUND_HALF_UP).toNumber()
-    console.log('====================================')
-    console.log('金钱', result.toFixed(digits, Decimal.ROUND_HALF_UP))
-    console.log('====================================')
+
     return result.toFixed(digits, Decimal.ROUND_HALF_UP)
   } catch (e) {
     return null

src/views/financialCenter/financialBilling.vue

@@ -72,6 +72,11 @@
         >
           <el-table-column type="selection" width="40" />
           <el-table-column prop="policyNo" label="业务编号" width="120" sortable />
+          <el-table-column prop="status" label="出账状态" width="160" sortable>
+            <template #default="{ row }">
+              {{ selectDictLabel(csf_fortune_status, row.status) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="isPart" label="是否拆分出账" width="120">
             <template #default="scope">
               <dict-tag :options="sys_no_yes" :value="scope.row.isPart" />
@@ -148,11 +153,7 @@
             sortable
             :formatter="row => `${row.fortuneUnpaidRatio}%`"
           />
-          <el-table-column prop="status" label="出账状态" width="160" sortable>
-            <template #default="{ row }">
-              {{ selectDictLabel(csf_fortune_status, row.status) }}
-            </template>
-          </el-table-column>
+
           <el-table-column
             prop="premium"
             label="期交保费"
@@ -727,6 +728,18 @@ const handleInputChange = async (formType, prop, value, item) => {
       const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, 2)
       await nextTick()
       rateExchangeForm.value.hkdAmount = hkdAmount
+      const hkdToPayoutRate = rateExchangeForm.value.hkdToPayoutRate
+      if (hkdToPayoutRate) {
+        const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2)
+        await nextTick()
+        rateExchangeForm.value.payoutAmount = payoutAmount
+      }
+      const exchangeRate = rateExchangeForm.value.exchangeRate
+      if (exchangeRate) {
+        const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided')
+        await nextTick()
+        rateExchangeForm.value.ruleAmount = ruleAmount
+      }
     } else if (prop === 'originalAmount' && value && rateExchangeForm.value.originalToHkdRate) {
       // 计算港币金额
       const originalAmount = value
@@ -734,6 +747,19 @@ const handleInputChange = async (formType, prop, value, item) => {
       const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, 2)
       await nextTick()
       rateExchangeForm.value.hkdAmount = hkdAmount
+      const hkdToPayoutRate = rateExchangeForm.value.hkdToPayoutRate
+      if (hkdToPayoutRate) {
+        const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2)
+        await nextTick()
+        rateExchangeForm.value.payoutAmount = payoutAmount
+      }
+      const exchangeRate = rateExchangeForm.value.exchangeRate
+      if (exchangeRate) {
+        const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided')
+
+        await nextTick()
+        rateExchangeForm.value.ruleAmount = ruleAmount
+      }
     }
     //2.计算实际发放金额   港币金额*港币->发放币种汇率
     if (prop == 'hkdAmount' && value && rateExchangeForm.value.hkdToPayoutRate) {
@@ -791,8 +817,20 @@ const handleInputChange = async (formType, prop, value, item) => {
       const originalToHkdRate = value
       const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, 2)
       await nextTick()
-
       addCheckRecordFormModel.value.hkdAmount = hkdAmount
+
+      const hkdToPayoutRate = addCheckRecordFormModel.value.hkdToPayoutRate
+      if (hkdToPayoutRate) {
+        const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2)
+        await nextTick()
+        addCheckRecordFormModel.value.payoutAmount = payoutAmount
+      }
+      const exchangeRate = addCheckRecordFormModel.value.exchangeRate
+      if (exchangeRate) {
+        const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided')
+        await nextTick()
+        addCheckRecordFormModel.value.ruleAmount = ruleAmount
+      }
     } else if (
       prop === 'originalAmount' &&
       value &&
@@ -805,6 +843,18 @@ const handleInputChange = async (formType, prop, value, item) => {
       console.log('新增', hkdAmount)
       await nextTick()
       addCheckRecordFormModel.value.hkdAmount = hkdAmount
+      const hkdToPayoutRate = addCheckRecordFormModel.value.hkdToPayoutRate
+      if (hkdToPayoutRate) {
+        const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2)
+        await nextTick()
+        addCheckRecordFormModel.value.payoutAmount = payoutAmount
+      }
+      const exchangeRate = addCheckRecordFormModel.value.exchangeRate
+      if (exchangeRate) {
+        const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided')
+        await nextTick()
+        addCheckRecordFormModel.value.ruleAmount = ruleAmount
+      }
     }
     //2.计算实际发放金额   港币金额*港币->发放币种汇率
     if (prop == 'hkdAmount' && value && addCheckRecordFormModel.value.hkdToPayoutRate) {
@@ -980,7 +1030,7 @@ const addSpiltRecord = () => {
     console.log('比例', ratio)
 
     if (ratio > 100 || ratio == 100) {
-      ElMessage.error('应出账比例不能大于100%')
+      ElMessage.error('出账比例不能大于100%')
       return
     }
   }

src/views/sign/appointment/appointmentEdit.vue

@@ -487,7 +487,7 @@ const processInfo = ref({
   fnaNo: '暂无',
   status: '未完成',
   createTime: proxy.parseTime(new Date()),
-  customerName: userStore.name
+  creatorName: userStore.realName
 })
 const editStatus = ref(null) //编辑状态
 const execlDialog = ref(false)

src/views/sign/policyReceipts/premiumRecon.vue

@@ -876,7 +876,6 @@ async function onSelectChange(type, prop, value, item) {
 const getPolicyInfo = async (policyNo, type, valueType) => {
   try {
     const res = await policyDetail(policyNo)
-    console.log('姓名', res)
     if (type == 'remittance') {
       if (valueType == 'TBR') {
         remittanceFormModel.value.payer = res.data.policyHolder
@@ -1321,17 +1320,16 @@ const handleCurrentChange = val => {
 const tableData = ref([])
 
 const handleSelect = (command, row) => {
-  selectedRow.value = row
+  selectedRow.value = JSON.parse(JSON.stringify(row))
+  tempPolicyNo.value = selectedRow.value.policyNo
   if (command === 'editRecord') {
     currentRow.value = JSON.parse(JSON.stringify(row))
     getPremiumReconciliationDetail(row)
   } else if (command === 'settingResult') {
     affirmFormModel.value = {}
     settingAffirmLoading.value = false
-
     showAffirm.value = true
     currentRow.value = JSON.parse(JSON.stringify(row))
-    tempPolicyNo.value = currentRow.value.policyNo
     getPolicyInfo(row.policyNo, 'affirm')
   }
 }