Merge branch 'test' into 'dev'

应付款管理增加转介人职级，薪资发放增加设置出账日的功能

See merge request !110

src/views/financialCenter/financialSalary.vue

@@ -67,7 +67,7 @@
             min-width="150"
             show-overflow-tooltip
           />
-          <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip />
+          <!-- <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip /> -->
           <el-table-column fixed="right" label="操作" min-width="120">
             <template #default="{ row }">
               <el-popover placement="right" :width="200" trigger="click">
@@ -294,6 +294,24 @@
         <el-table-column label="修订内容" prop="editContent" align="center"></el-table-column>
       </el-table>
     </CommonDialog>
+    <!-- 设置薪资日 -->
+    <CommonDialog
+      dialogTitle="设置薪资日"
+      dialogWidth="80%"
+      :openDialog="showSalarySetting"
+      :showAction="true"
+      :showClose="true"
+      @close="showSalarySetting = false"
+      @confirm = "salaryDataSetting"
+    >
+     <el-date-picker
+        v-model="fortuneAccountDate"
+        type="date"
+        placeholder="选择薪资日"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+      />
+    </CommonDialog>
   </div>
 </template>
 
@@ -310,7 +328,8 @@ import {
   borkerDetail,
   billSplitRate,
   billBatchSave,
-  billCalculateToAmount
+  billCalculateToAmount,
+  updatePolicyFortuneAccount
 } from '@/api/financial/commission'
 import { formatCurrency, inputThousands } from '@/utils/number'
 import { generateId } from '@/utils/common'
@@ -372,6 +391,8 @@ const tableData = ref([])
 const loading = ref(false)
 const selectedRows = ref([])
 const showReviseRecord = ref(false)
+const showSalarySetting = ref(false)
+const fortuneAccountDate = ref()
 const reviseList = ref([])
 const currencyTypeOptions = ref([])
 
@@ -398,8 +419,8 @@ const debounceChangeRateMap = new WeakMap()
 const debounceChangeToAmountMap = new WeakMap()
 // 表格操作菜单
 const dropdownItems = [
-  { label: '拆分出账', value: 'splitBilling' }
-  // { label: '更新', value: 'editRecord' },
+  { label: '拆分出账', value: 'splitBilling' },
+  { label: '设置出账日', value: 'settingSalaryDate' },
   // { label: '查看记录', value: 'viewRecord' }
 ]
 //=============拆分出账开始================
@@ -662,8 +683,31 @@ const handleSelect = (e, row) => {
     billCurrentPage.value = 1
     billTableList.value = []
     getSplitTableList()
+  }else if(e==='settingSalaryDate'){
+    console.log('更新薪资数据')
+    fortuneAccountDate.value=  currentRow.value.fortuneAccountDate || ''
+    showSalarySetting.value = true;
   }
 }
+
+const salaryDataSetting = async (e)=>{
+  try{
+      const params = {
+        fortuneAccountBizId : currentRow.value.fortuneAccountBizId,
+        fortuneAccountDate:fortuneAccountDate.value
+      };
+      const response = await updatePolicyFortuneAccount(params)
+      if(response.code==200){
+        showSalarySetting.value = false;
+        ElMessage.success('修改成功')
+        getList()
+      }
+  }catch (error) {
+    console.error('获取数据失败:', error)
+    ElMessage.error('修改失败')
+  }
+ 
+}
 // 分页事件
 const handleSizeChange = val => {
   pageSize.value = val

src/views/financialCenter/payables.vue

@@ -137,6 +137,7 @@ const payableReportTableData = ref([])
 const payableReportTableColumns = ref([
   { prop: 'policyNo', label: '保单号', sortable: true, width: '150', formatter: (row) => row.policyNo || '-' },
   { prop: 'broker', label: '转介人(主)', sortable: true, width: '150', formatter: (row) => row.broker || '-' },
+  { prop: 'brokerGradeName', label: '职级', sortable: true, width: '80', formatter: (row) => row.brokerGradeName || '-' },
   { prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '120', formatter: (row) => row.fortunePeriod || '-' },
   { prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '120', formatter: (row) => row.fortuneTotalPeriod || '-' },
   { prop: 'payoutDate', label: '出账日（估）', sortable: true, width: '130', },
@@ -159,6 +160,7 @@ const payableReportListTableColumns = ref([
   // { prop: 'payableNo', label: '应付账款编号', sortable: true, width: '120', formatter: (row) => row.payableNo || '-' },
   { prop: 'policyNo', label: '保单号', sortable: true, width: '130', formatter: (row) => row.policyNo || '-' },
   { prop: 'broker', label: '转介人', sortable: true, width: '120', formatter: (row) => row.broker || '-' },
+  { prop: 'brokerGradeName', label: '职级', sortable: true, width: '120', formatter: (row) => row.brokerGradeName || '-' },
   { prop: 'fortuneName', label: '出账项目', sortable: true, width: '120', formatter: (row) => row.fortuneName || '-' },
   { prop: 'status', label: '出账状态', sortable: true, width: '120', formatter: (row) => getDictLabel('csf_expected_fortune_status', row.status) || '-' },
   { prop: 'currencyName', label: '出账币种', sortable: true, width: '100', formatter: (row) => row.currencyName || '-' },

src/views/sign/underwritingMain/index.vue

@@ -17,8 +17,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="appointmentNo" label="预约编号" width="200" sortable />
-          <el-table-column prop="signDate" label="签单日" width="200" sortable />
-          <el-table-column prop="latestPaymentDate" label="最晚缴费日" width="200" sortable />
+          <el-table-column prop="effectiveDate" label="生效日" width="150" sortable />
+          <el-table-column prop="signDate" label="签单日" width="150" sortable />
+          <el-table-column prop="latestPaymentDate" label="最晚缴费日" width="150" sortable />
           <el-table-column prop="policyHolder" label="投保人" width="150" sortable />
           <el-table-column prop="insured" label="受保人" width="150" sortable />
           <el-table-column prop="insuranceCompany" label="保险公司" width="200" sortable />