Merge remote-tracking branch 'origin/dev' into prod

src/views/financialCenter/financialIncome.vue

@@ -42,7 +42,7 @@
           </el-row>
         </div>
         <el-row>
-          <el-col :span="4">
+          <el-col :span="6">
            <el-text tag="mark" class="mx-1">实佣率=实际入账金额/结算汇率/每期保费</el-text>
           </el-col>
           <el-col :span="6">

src/views/financialCenter/receivables.vue

@@ -778,8 +778,8 @@ const receivableReportTableData = ref([])
 const receivableReportTableColumns = ref([
     { prop: 'policyNo', label: '保单号', sortable: true, width: '150',fixed:'left', formatter: (row) => row.policyNo || '-' },
     { prop: 'reconciliationCompany', label: '对账公司', sortable: true, width: '150', formatter: (row) => row.reconciliationCompany || '-' },
-    { prop: 'commissionPeriod', label: '入账期数', sortable: true, width: '120', formatter: (row) => row.commissionPeriod || '-' },
-    { prop: 'totalPeriod', label: '入账总期数', sortable: true, width: '120', formatter: (row) => row.totalPeriod || '-' },
+    { prop: 'commissionPeriod', label: '入账期数', sortable: true, width: '100', formatter: (row) => row.commissionPeriod || '-' },
+    { prop: 'totalPeriod', label: '入账总期数', sortable: true, width: '100', formatter: (row) => row.totalPeriod || '-' },
     { prop: 'commissionDate', label: '入账日（估）', sortable: true, width: '130', },
     { prop: 'commissionRatio', label: '产品对应来佣率', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
     { prop: 'hkdAmount', label: '预估入账金额HKD', sortable: true, width: '120', formatter: (row) => formatCurrency(row.hkdAmount || 0) },
@@ -793,6 +793,7 @@ const receivableReportTableColumns = ref([
     { prop: 'premium', label: '期交保费', sortable: true, width: '120', formatter: (row) => formatCurrency(row.premium || 0) },
     { prop: 'policyCurrency', label: '保单币种', sortable: true, width: '120', formatter: (row) => row.policyCurrency || '-' },
 ])
+// 应收明细
 const receivableReportItemTableColumns = ref([
     { prop: 'commissionBizType', label: '应收单类型', sortable: true, width: '150', formatter: (row) => getCommissionBizTypeLabel(row.commissionBizType) || '-' },
     { prop: 'receivableNo', label: '应收款编号', sortable: true, width: '150', formatter: (row) => row.receivableNo || '-' },
@@ -805,9 +806,9 @@ const receivableReportItemTableColumns = ref([
     { prop: 'commissionDate', label: '入账日（估）', sortable: true, width: '130', formatter: (row) => row.commissionDate || '-' },
     { prop: 'commissionRatio', label: '产品对应来佣率', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) + '%' || '-' },
     { prop: 'expectedAmount', label: '预估入账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.expectedAmount || 0) },
-    { prop: 'paidRatio', label: '已入账比例', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' },
+    { prop: 'paidRatio', label: '实佣率', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' },
     { prop: 'paidAmount', label: '已入账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) },
-    { prop: 'pendingRatio', label: '待入账比例', sortable: true, width: '120', formatter: (row) => (row.pendingRatio || 0) + '%' || '-' },
+    { prop: 'pendingRatio', label: '实佣率缺口', sortable: true, width: '120', formatter: (row) => (row.pendingRatio || 0) + '%' || '-' },
     { prop: 'pendingAmount', label: '待入账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.pendingAmount || 0) },
     { prop: 'defaultExchangeRate', label: '结算汇率（估）', sortable: true, width: '120'},
     { prop: 'insuranceCompany', label: '保险公司', sortable: true, width: '120', formatter: (row) => row.insuranceCompany || '-' },

src/views/sign/appointment/components/fileUpload.vue

@@ -302,6 +302,7 @@ const handleView = row => {
 const downloadFile = () => {
   let apiMaterialDtoList = []
   let params = {
+    projectBizId:userStore.projectInfo.projectBizId || '',
     objectName: '预约附件材料包', //对象名（包名）
     objectBizId: '' //对象业务ID
   }

src/views/sign/underwritingMain/policyDetail.vue

@@ -239,7 +239,7 @@ import CommonDialog from '@/components/commonDialog'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue'
 import { getPolicyfollow, getProductList } from '@/api/sign/underwritingMain'
-import { uploadOssFileList,delUploadFile } from '@/api/common'
+import { uploadOssFileList,delUploadFile,getUserSaleExpandList } from '@/api/common'
 import { getProcessDetail } from '@/api/sign/fna'
 import { premiumReconciliationList } from '@/api/sign/policy'
 import { loadDicts, getDictLabel } from '@/utils/useDict'
@@ -538,6 +538,15 @@ const policyInfoFormConfig = ref([
     rules: [{ required: true, message: '请选择出单经纪公司', trigger: 'blur' }]
   },
   {
+    type: 'select',
+    prop: 'professionalInvestor',
+    label: '专业投资者',
+    options: [
+      { label: '是', value: 'Yes' },
+      { label: '否', value: 'No' }
+    ]
+  },
+  {
     type: 'input',
     prop: 'coolingOffDays',
     label: '冷静期(天)',