Merge branch 'wyz' into 'test'

放开出账检核--完成检核

See merge request !114

src/views/financialCenter/financialBilling.vue

@@ -72,7 +72,11 @@
         >
           <el-table-column type="selection" width="40" />
           <el-table-column prop="policyNo" label="业务编号" width="120" sortable />
-          <el-table-column prop="isPart" label="是否拆分出账" width="120" />
+          <el-table-column prop="isPart" label="是否拆分出账" width="120">
+            <template #default="scope">
+              <dict-tag :options="sys_no_yes" :value="scope.row.isPart" />
+            </template>
+          </el-table-column>
           <el-table-column prop="fortuneBizType" label="应付单类型" width="120" sortable>
             <template #default="{ row }">
               {{ getFortuneBizTypeLabel(row.fortuneBizType) }}
@@ -171,7 +175,7 @@
                 <el-menu @select="handleSelect($event, row)" popper-class="custom-menu">
                   <el-menu-item
                     :index="item.value"
-                    v-for="item in dropdownItems"
+                    v-for="item in getOperateItems(row)"
                     :key="item.value"
                     >{{ item.label }}</el-menu-item
                   >
@@ -333,7 +337,7 @@ const splitTableData = ref([])
 const installmentsBillFlag = ref(false)
 const settingBillYearMonthFlag = ref(false)
 const { proxy } = getCurrentInstance()
-const { csf_fortune_status } = proxy.useDict('csf_fortune_status')
+const { csf_fortune_status, sys_no_yes } = proxy.useDict('csf_fortune_status', 'sys_no_yes')
 
 const userStore = useUserStore()
 // 分页相关
@@ -351,6 +355,23 @@ const dropdownItems = [
   { label: '设置出账年月(实)', value: 'settingBillYearMonth' },
   { label: '修改结算汇率', value: 'editExchangeRate' }
 ]
+// 动态生成操作菜单项（根据行数据）
+const getOperateItems = row => {
+  const items = []
+
+  // 条件：isPart == 1 时不显示分期出账（使用宽松相等，兼容字符串 '1'）
+  if (!(row.isPart == 1)) {
+    items.push({ label: '分期出账', value: 'billInstallments' })
+  }
+
+  // 始终显示的菜单项（保持原始顺序）
+  items.push(
+    { label: '设置出账年月(实)', value: 'settingBillYearMonth' },
+    { label: '修改结算汇率', value: 'editExchangeRate' }
+  )
+
+  return items
+}
 const searchConfig = ref([
   {
     type: 'input',
@@ -979,18 +1000,18 @@ const handleSelectionChange = val => {
 const submitSettingBillYearMonth = async () => {
   if (billTimeType.value == 'multiple') {
     //等后端接口
-    //   try {
-    //   const res = await downloadPolicyFortuneAccount({
-    //     fortuneBizIdList: multipleSelection.value.map(item => item.fortuneBizId)
-    //   })
-    //   if (res.code === 200) {
-    //     ElMessage.success('完成检核，等待关账')
-    //     loadTableData()
-    //   }
-    // } catch (error) {
-    //   console.error('检核失败:', error)
-    //   ElMessage.error(error.response?.data?.msg || '检核失败')
-    // }
+    try {
+      const res = await downloadPolicyFortuneAccount({
+        fortuneBizIdList: multipleSelection.value.map(item => item.fortuneBizId)
+      })
+      if (res.code === 200) {
+        ElMessage.success('完成检核，等待关账')
+        loadTableData()
+      }
+    } catch (error) {
+      console.error('检核失败:', error)
+      ElMessage.error(error.response?.data?.msg || '检核失败')
+    }
   } else if (billTimeType.value == 'single') {
     const params = {
       fortuneBizId: selectedRow.value.fortuneBizId,

src/views/sign/FnaList/components/customer.vue

@@ -369,13 +369,14 @@
           <template #table>
             <el-table v-loading="tableLoading" :data="tableData" @row-click="handleExport">
               <!-- <el-table-column type="selection" width="55" align="center" /> -->
-              <el-table-column label="姓名" align="center" prop="nameCn" width="200" />
+              <el-table-column label="姓名" align="center" prop="nameCn" width="200" fixed="left" />
+              <el-table-column label="姓名(英文)" align="center" prop="namePyEn" width="200" />
               <el-table-column label="性别" align="center" prop="gender">
                 <template #default="scope">
                   <dict-tag :options="fetchDictData('sys_gender')" :value="scope.row.gender" />
                 </template>
               </el-table-column>
-              <el-table-column label="证件类型" align="center" prop="documentType">
+              <el-table-column label="证件类型" align="center" prop="documentType" width="150">
                 <template #default="scope">
                   <dict-tag
                     :options="fetchDictData('csf_id_type')"
@@ -384,8 +385,8 @@
                 </template>
               </el-table-column>
 
-              <el-table-column label="证件号码" align="center" prop="idNumber" />
-              <el-table-column label="电话号码" align="center" prop="mobile" />
+              <el-table-column label="证件号码" align="center" prop="idNumber" width="200" />
+              <el-table-column label="电话号码" align="center" prop="mobile" width="200" />
               <el-table-column label="出生日期" align="center" width="180" prop="birthday">
                 <template #default="scope">
                   <span>{{ scope.row.birthday ? formatToDate(scope.row.birthday) : '--' }}</span>