Merge branch 'wyz' into 'test'

Wyz

See merge request !161

src/views/financialCenter/financialSalary.vue

@@ -368,6 +368,11 @@ const searchFormRef = ref(null)
 const searchParams = ref({})
 const searchConfig = ref([
   {
+    type: 'input',
+    prop: 'businessNo',
+    label: '业务编号'
+  },
+  {
     type: 'select',
     prop: 'brokerBizIdList',
     label: '转介人',

src/views/financialCenter/payables.vue

@@ -450,17 +450,41 @@ const payableReportListTableColumns = ref([
   { prop: 'currentPaymentRuleAmount', label: '本次发放保单记账金额', sortable: true, width: '160' },
   { prop: 'currentPayoutAmount', label: '本次发放金额', sortable: true, width: '120' },
   { prop: 'currentPaymentHkdAmount', label: '本次发放折合港币金额', sortable: true, width: '160' },
-  { prop: 'currentPaymentRatio', label: '本次发放比例', sortable: true, width: '120' },
+  {
+    prop: 'currentPaymentRatio',
+    label: '本次发放比例',
+    sortable: true,
+    width: '120',
+    formatter: row => (row.currentPaymentRatio ? row.currentPaymentRatio + '%' : '-')
+  },
   { prop: 'paidRuleAmount', label: '累积已发放保单记账金额', sortable: true, width: '180' },
   { prop: 'paidAmount', label: '累积已发放港币金额', sortable: true, width: '160' },
-  { prop: 'paidRatio', label: '累积已发放比例%', sortable: true, width: '140' },
-  { prop: 'unpaidRatio', label: '剩余发放比例%', sortable: true, width: '120' },
+  {
+    prop: 'paidRatio',
+    label: '累积已发放比例',
+    sortable: true,
+    width: '140',
+    formatter: row => (row.paidRatio ? row.paidRatio + '%' : '-')
+  },
+  {
+    prop: 'unpaidRatio',
+    label: '剩余发放比例',
+    sortable: true,
+    width: '120',
+    formatter: row => (row.unpaidRatio ? row.unpaidRatio + '%' : '-')
+  },
   { prop: 'unpaidRuleAmount', label: '剩余保单记账金额', sortable: true, width: '160' },
   { prop: 'unpaidRuleAmounthHkd', label: '剩余发放折合港币金额', sortable: true, width: '180' },
   { prop: 'premium', label: '期交保费', sortable: true, width: '120' },
   { prop: 'fortuneTotalPeriod', label: '供款期数', sortable: true, width: '100' },
   { prop: 'productName', label: '产品计划', sortable: true, width: '150' },
-  { prop: 'brokerRatio', label: '持有比例%', sortable: true, width: '100' },
+  {
+    prop: 'brokerRatio',
+    label: '持有比例',
+    sortable: true,
+    width: '100',
+    formatter: row => (row.brokerRatio ? row.brokerRatio + '%' : '-')
+  },
   { prop: 'remark', label: '备注', sortable: false, width: '200' },
   { prop: 'creatorName', label: '创建人', sortable: true, width: '100' },
   { prop: 'createTime', label: '创建时间', sortable: true, width: '160' },
@@ -1536,7 +1560,7 @@ const pageTotal = ref(0)
 const loading = ref(false)
 // 表格操作菜单
 const dropdownItems = [
-  { label: '出账记录', value: 'payRecord' },
+  // { label: '出账记录', value: 'payRecord' },
   { label: '设置状态', value: 'setStatus' },
   { label: '更新数据', value: 'updateData' }
 ]

src/views/sign/policyReceipts/premiumRecon.vue

@@ -321,12 +321,7 @@ import { getToken } from '@/utils/auth'
 import { getNowTime, formatToDate, formatToDateTime } from '@/utils/date'
 const filePreviewRef = ref(null)
 let tempPolicyNo = ref('')
-const previewVisible = ref(false)
-const currentFileUrl = ref('')
-const currentFileName = ref('')
-const currentOtherFile = ref({ fileUrl: '', fileName: '' })
 const { proxy } = getCurrentInstance()
-const userStore = useUserStore()
 // 分页相关
 const currentPage = ref(1)
 const pageSize = ref(10)
@@ -1093,18 +1088,18 @@ const editRemittance = async row => {
   newObj.insuranceCompany = addCheckRecordFormModel.value.insuranceCompany
   // 上传回显得格式是[{url:''}]所以要处理一下
   for (const key in newObj) {
-    if (
-      key == 'accountVerificationDtoList' ||
-      (key == 'paymentVoucherDtoList' && newObj[key] && newObj[key].length > 0)
-    ) {
+    if (key == 'accountVerificationDtoList' || key == 'paymentVoucherDtoList') {
       console.log('key', key)
-
+      if (newObj[key] && newObj[key].length > 0) {
         newObj[key] = newObj[key].map(item => {
           return {
             url: item.fileUrl,
             name: item.fileName
           }
         })
+      } else {
+        newObj[key] = []
+      }
     }
     if (key == 'apiPremiumRemittanceFileDtoList' && newObj[key] && newObj[key].length > 0) {
       newObj[key] = newObj[key].map(item => {
@@ -1114,28 +1109,26 @@ const editRemittance = async row => {
             url: item.fileUrl
           }
         }
-        // else {
-        //   return {
-        //     url: item.fileUrl,
-        //     name: item.fileName
-        //   }
-        // }
       })
     }
   }
 
   remittanceFormModel.value = newObj
-  console.log('remittanceFormModel.value', remittanceFormModel.value)
+
   if (newObj.accountVerificationDtoList && newObj.accountVerificationDtoList.length > 0) {
     remittanceFormModel.value.accountVerificationList = newObj.accountVerificationDtoList
+  } else {
+    remittanceFormModel.value.accountVerificationList = []
   }
   if (newObj.paymentVoucherDtoList && newObj.paymentVoucherDtoList.length > 0) {
     remittanceFormModel.value.paymentVoucherList = newObj.paymentVoucherDtoList
+  } else {
+    remittanceFormModel.value.paymentVoucherList = []
   }
   if (remittanceFormModel.value.apiPremiumRemittanceFileDtoList.length > 0) {
     tempOtherFileList.value = remittanceFormModel.value.apiPremiumRemittanceFileDtoList
   }
-
+  console.log('remittanceFormModel.value', remittanceFormModel.value)
   showRemittance.value = true
 }
 // 删除汇款记录