From 78338e1936816c5760a02aa0a37b40ed831faee9 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期四, 26 六月 2025 14:53:11 +0800 Subject: [PATCH] Merge branch 'dev-2.2.0' of http://120.26.58.240:8888/r/JYBIndependentFront into dev-2.2.0 --- src/views/Home/Home.vue | 81 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 73 insertions(+), 8 deletions(-) diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue index d31334e..d15d74c 100644 --- a/src/views/Home/Home.vue +++ b/src/views/Home/Home.vue @@ -26,6 +26,15 @@ </QueryFilterItem> <QueryFilterItem> <FieldRadio + v-model="extraParamState.auditStatus" + :value-enum="InsurancePolicyAuditStatusEnumText" + buttonStyle + showAllBtn + @change="getList()" + /> + </QueryFilterItem> + <QueryFilterItem> + <FieldRadio v-model="extraParamState.status" :value-enum="InsurancePolicyStatusEnumText" buttonStyle @@ -47,11 +56,16 @@ <el-button @click="handleDownload()" type="primary" style="margin-right: 10px" link >妯℃澘涓嬭浇</el-button > - <el-button @click="handleUpload()" type="primary" style="margin-right: 10px" - >瀵煎叆</el-button + >瀵煎叆鎶曚繚浜哄憳</el-button > - + <!-- <el-button + v-if="AppType === 'jx'" + @click="handleUpload()" + type="primary" + style="margin-right: 10px" + >澶ф壒閲忔暟鎹鍏�</el-button + > --> <el-button @click="getInsurancePageExport()" type="primary" link>瀵煎嚭淇濆崟鍒楄〃</el-button> <el-button @click="getInsuranceStaffPageExport()" type="primary" link >瀵煎嚭鍦ㄤ繚浜哄憳</el-button @@ -68,6 +82,23 @@ rowKey: 'id', }" > + <template #auditStatus="{ row }"> + <el-tooltip + class="box-item" + effect="dark" + :content="row.auditRemark" + placement="top-start" + v-if="row.auditStatus === InsurancePolicyAuditStatusEnum.Reject" + > + <div style="display: inline-flex; align-items: center"> + {{ InsurancePolicyAuditStatusEnumText[row.auditStatus] }} + <el-icon size="16" color="#3a71ff"><QuestionFilled /></el-icon> + </div> + </el-tooltip> + <el-text v-else> + {{ InsurancePolicyAuditStatusEnumText[row.auditStatus] }} + </el-text> + </template> </ProTableV2> </AppContainer> <UploadInsurePersonDialog v-bind="dialogProps" /> @@ -103,6 +134,10 @@ insuranceTypeText, InsurancePolicyStatusEnumText, InsurancePolicyStatusEnum, + AppType, + InsurancePolicyAuditStatusEnumText, + InsurancePolicyAuditStatusEnum, + InsurancePolicyProductIdNumberEnum, } from '@/constants'; import dayjs from 'dayjs'; import _ from 'lodash'; @@ -130,7 +165,9 @@ onClick: (role) => handleBatch(role), }, extraProps: { - hide: (row: API.GetInsurancePageOutput) => row.status !== InsurancePolicyStatusEnum.Effecting, + hide: (row: API.GetInsurancePageOutput) => + row.productIdNumber === InsurancePolicyProductIdNumberEnum.SJB || + row.status !== InsurancePolicyStatusEnum.Effecting, }, }, { @@ -143,6 +180,8 @@ }, extraProps: { hide: (row: API.GetInsurancePageOutput) => + row.productIdNumber === InsurancePolicyProductIdNumberEnum.SJB || + row.auditStatus !== InsurancePolicyAuditStatusEnum.Pass || row.status !== InsurancePolicyStatusEnum.WaitEffect, }, }, @@ -155,10 +194,18 @@ onClick: (role) => handleDownloadInsureFile(role), }, extraProps: { - hide: (row: API.GetInsurancePageOutput) => - row.status === InsurancePolicyStatusEnum.WaitEffect, + hide: (row: API.GetInsurancePageOutput) => !row.insureBillUrl, }, }, + // { + // data: { + // enCode: 'standarEndoBtn', + // name: '鐢宠閫�淇�', + // }, + // emits: { + // onClick: (role) => handleStandarEndo(role), + // }, + // }, ]).filter(Boolean); const BaseState = { @@ -194,6 +241,7 @@ creationDate: [] as unknown as ModelValueType, condition: '', status: '' as any as InsurancePolicyStatusEnum, + auditStatus: '' as any as InsurancePolicyAuditStatusEnum, insurancePeriod: '', }, columnsRenderProps: { @@ -228,6 +276,7 @@ condition: extraParamState.condition, insurancePeriod: extraParamState.insurancePeriod, status: extraParamState.status, + auditStatus: extraParamState.auditStatus, }; return params; } @@ -237,6 +286,7 @@ defaultFormParams: { serialNum: '', url: [] as UploadUserFile[], + productIdNumber: '', }, closeAfterConfirm: false, }); @@ -266,6 +316,7 @@ let params: API.APIimportInsStaffToListParams = { serialNum: editForm.serialNum, url: editForm.url?.[0]?.path, + productIdNumber: editForm.productIdNumber, }; let res = await insuranceOrderServices.importInsStaffToList(params); if (res.length > 0) { @@ -404,8 +455,8 @@ } function handleBatch(row: API.GetInsurancePageOutput) { if ( - dayjs(row.effectEndTime).isAfter(dayjs()) || - dayjs(row.effectEndTime).isBefore(dayjs(), 'day') + dayjs(row.effectEndTime).isBefore(dayjs()) || + dayjs(row.effectEndTime).isSame(dayjs(), 'day') ) { Message.errorMessage('淇濋櫓浠婂ぉ鍒版湡锛屾棤娉曟壒鏀�'); return; @@ -422,4 +473,18 @@ }, }); } + +async function handleStandarEndo(row: API.GetInsurancePageOutput) { + try { + await Message.deleteMessage('鏄惁鐢宠閫�淇�?'); + let params = { + id: row.id, + }; + // let res = await userServices.deleteRole(params); + // if (res) { + // Message.successMessage('鎿嶄綔鎴愬姛'); + // getList(paginationState.pageIndex); + // } + } catch (error) {} +} </script> -- Gitblit v1.9.1