From 92034e64c9bb28c262b0fcb90660b58328aa2f5e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 23 十月 2025 14:35:05 +0800
Subject: [PATCH] fix: bug
---
src/views/InsuranceClaim/components/InsuranceClaimView.vue | 164 ++++++++++++++++++++++++++++++------------------------
1 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/src/views/InsuranceClaim/components/InsuranceClaimView.vue b/src/views/InsuranceClaim/components/InsuranceClaimView.vue
index 22591b9..e0c6015 100644
--- a/src/views/InsuranceClaim/components/InsuranceClaimView.vue
+++ b/src/views/InsuranceClaim/components/InsuranceClaimView.vue
@@ -64,10 +64,14 @@
<ProFormColItem :span="6">
<ProFormItemV2
label="淇濆崟鍙�:"
- prop="name"
+ prop="orderNo"
:check-rules="[{ message: '璇疯緭鍏ヤ繚鍗曞彿' }]"
>
- <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ヤ繚鍗曞彿" :maxlength="30" />
+ <ProFormText
+ v-model.trim="form.orderNo"
+ placeholder="璇疯緭鍏ヤ繚鍗曞彿"
+ :maxlength="30"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -79,29 +83,39 @@
<ProFormColItem :span="6">
<ProFormItemV2
label="鍙備繚鏈烘瀯:"
- prop="insuredInstitution"
- :check-rules="[{ message: '璇烽�夋嫨鍙備繚鏈烘瀯' }]"
+ prop="insuranceOrg"
+ :check-rules="[{ message: '璇疯緭鍏ュ弬淇濇満鏋�' }]"
>
- <ProFormSelect
+ <!-- <ProFormSelect
placeholder="璇烽�夋嫨鍙備繚鏈烘瀯"
:value-enum="InsuredInstitutionEnum"
clearable
v-model="form.insuredInstitution"
- ></ProFormSelect>
+ ></ProFormSelect> -->
+ <ProFormText
+ v-model.trim="form.insuranceOrg"
+ :maxlength="30"
+ placeholder="璇疯緭鍏ュ弬淇濇満鏋�"
+ />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="6">
<ProFormItemV2
label="鎶曚繚鏂规:"
prop="insuranceScheme"
- :check-rules="[{ message: '璇烽�夋嫨鎶曚繚鏂规' }]"
+ :check-rules="[{ message: '璇疯緭鍏ユ姇淇濇柟妗�' }]"
>
- <ProFormSelect
+ <!-- <ProFormSelect
placeholder="璇烽�夋嫨鎶曚繚鏂规"
:value-enum="InsuranceSchemeEnum"
clearable
v-model="form.insuranceScheme"
- ></ProFormSelect>
+ ></ProFormSelect> -->
+ <ProFormText
+ v-model.trim="form.insuranceScheme"
+ :maxlength="30"
+ placeholder="璇疯緭鍏ユ姇淇濇柟妗�"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -118,11 +132,8 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="6">
- <ProFormItemV2 label="鎶曚繚浜�:" prop="laborContractEnterprise" mode="read">
- <ProFormText
- v-model.trim="form.laborContractEnterprise"
- placeholder="璇疯緭鍏ユ姇淇濅汉"
- />
+ <ProFormItemV2 label="鎶曚繚浜�:" prop="enterpriseName" mode="read">
+ <ProFormText v-model.trim="form.enterpriseName" placeholder="璇疯緭鍏ユ姇淇濅汉" />
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="6">
@@ -145,8 +156,8 @@
</ProFormItemV2>
</ProFormColItem>
<ProFormColItem :span="6">
- <ProFormItemV2 label="琚繚浜�:" prop="workEnterprise" mode="read">
- <ProFormText v-model.trim="form.workEnterprise" placeholder="璇疯緭鍏ヨ淇濅汉" />
+ <ProFormItemV2 label="琚繚浜�:" prop="enterpriseName" mode="read">
+ <ProFormText v-model.trim="form.enterpriseName" placeholder="璇疯緭鍏ヨ淇濅汉" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -289,51 +300,50 @@
</div>
<ClaimPicDemoView />
</div>
- <div class="chuck-add-or-edit-actions">
+ <div class="chuck-add-or-edit-actions" v-if="!isDetail">
<el-button @click="handleBack">鍏抽棴</el-button>
- <el-button v-if="!isDetail" type="primary" @click="handleSubmit">鎻愪氦</el-button>
+ <el-button type="primary" @click="handleSubmit">鎻愪氦</el-button>
</div>
</ProForm>
</ChunkCell>
- <!-- <ChunkCell title="鐞嗚禂缁撴灉">
- <ProForm :model="form" ref="claimFormRef" label-width="120px">
- <ProFormCol>
- <ProFormColItem :span="6">
- <ProFormItemV2 label="鐞嗚禂缁撴灉:" prop="claimResult">
- <ProFormSelect
- placeholder="璇烽�夋嫨鐞嗚禂缁撴灉"
- :value-enum="InsuranceClaimResultEnumText"
- clearable
- v-model="form.claimResult"
- ></ProFormSelect>
- </ProFormItemV2>
- </ProFormColItem>
- <ProFormColItem :span="6">
- <ProFormItemV2 label="缁�/鎾ゆ鏃堕棿:" prop="claimResultTime">
- <ProFormDatePicker
- v-model="form.claimResultTime"
- type="datetime"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨缁�/鎾ゆ鏃堕棿"
- ></ProFormDatePicker>
- </ProFormItemV2>
- </ProFormColItem>
- </ProFormCol>
- <ProFormItemV2 label="涓嬫閲戦:" prop="downPaymentAmount">
- <ProFormInputNumber
- v-model="form.downPaymentAmount"
- :controls="false"
- :min="0"
- :precision="2"
- ></ProFormInputNumber>
- </ProFormItemV2>
- <div class="chuck-add-or-edit-actions">
- <el-button @click="handleBack">鍏抽棴</el-button>
- <el-button type="primary" @click="handleSubmit">鎻愪氦</el-button>
- </div>
- </ProForm>
- </ChunkCell> -->
+ <ChunkCell title="鐞嗚禂缁撴灉" v-if="isDetail">
+ <ProForm :model="form" ref="claimFormRef" label-width="120px" :is-read="isDetail">
+ <ProFormCol>
+ <ProFormColItem :span="6">
+ <ProFormItemV2 label="鐞嗚禂缁撴灉:" prop="claimResult">
+ <ProFormSelect
+ placeholder="璇烽�夋嫨鐞嗚禂缁撴灉"
+ :value-enum="InsuranceClaimResultEnumText"
+ clearable
+ v-model="form.claimResult"
+ ></ProFormSelect>
+ </ProFormItemV2>
+ </ProFormColItem>
+ <ProFormColItem :span="6">
+ <ProFormItemV2 label="缁�/鎾ゆ鏃堕棿:" prop="claimResultTime">
+ <ProFormDatePicker
+ v-model="form.claimResultTime"
+ type="datetime"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ placeholder="璇烽�夋嫨缁�/鎾ゆ鏃堕棿"
+ ></ProFormDatePicker>
+ </ProFormItemV2>
+ </ProFormColItem>
+ </ProFormCol>
+ <ProFormItemV2 label="涓嬫閲戦:" prop="downPaymentAmount">
+ <ProFormInputNumber
+ v-model="form.downPaymentAmount"
+ :controls="false"
+ :min="0"
+ :precision="2"
+ ></ProFormInputNumber>
+ </ProFormItemV2>
+ <div class="chuck-add-or-edit-actions">
+ <el-button @click="handleBack">鍏抽棴</el-button>
+ </div>
+ </ProForm>
+ </ChunkCell>
</AppScrollContainer>
<SelectOrderDialog v-bind="dialogProps" />
</LoadingLayout>
@@ -390,15 +400,24 @@
const route = useRoute();
const insuranceOrderId = (route.params.id as string) ?? '';
+const routeId = (route.query.routeId as string) ?? '';
const fromRoute = route.query.fromRoute as string;
const { closeViewPush } = useRouteView();
const datePickerKey = ref(1);
-const { form, isLoading, claimDetail, disabledReportedDate, queryClaimDetailByOrderId, resetForm } =
- useInsuranceClaimDetail({
- insuranceOrderId,
- });
+const {
+ form,
+ isLoading,
+ claimDetail,
+ disabledReportedDate,
+ queryClaimDetailByOrderId,
+ resetForm,
+ resetFormWithNotOrder,
+} = useInsuranceClaimDetail({
+ insuranceOrderId,
+ fromRoute,
+});
// const { existedInsuranceOrderList } = useInsuranceOrderListByOrderRelevance({
// params: computed(() => ({
@@ -447,14 +466,10 @@
idIdNumber: form.idNumber,
reportedTime: form.reportedTime,
};
- let existedInsuranceOrderList = await queryClient.ensureQueryData({
- queryKey: ['insuranceOrderServices/getInsuranceOrderListByOrderRelevance', params],
- queryFn: async () => {
- return await insuranceOrderServices.getInsuranceOrderListByOrderRelevance(params, {
- showLoading: false,
- });
- },
- });
+ let existedInsuranceOrderList =
+ await insuranceOrderServices.getInsuranceOrderListByOrderRelevance(params, {
+ showLoading: false,
+ });
if (existedInsuranceOrderList.length == 1) {
form.insuranceOrderId = existedInsuranceOrderList[0].id;
} else if (existedInsuranceOrderList.length > 1) {
@@ -462,6 +477,7 @@
insuranceOrderList: existedInsuranceOrderList,
});
} else {
+ resetFormWithNotOrder();
Message.errorMessage('鏈壘鍒板尮閰嶇殑淇濆崟淇℃伅');
}
}
@@ -511,11 +527,12 @@
name: form.name,
idNumber: form.idNumber,
workType: form.workType,
- laborContractEnterprise: form.laborContractEnterprise,
- workEnterprise: form.workEnterprise,
+ laborContractEnterprise: form.enterpriseName,
+ workEnterprise: form.enterpriseName,
insuranceBeginTime: format(form.insuranceBeginTime),
insuranceEndTime: format(form.insuranceEndTime),
- insuredInstitution: form.insuredInstitution,
+ insuredInstitution: form.insuranceOrg,
+ orderNo: form.orderNo,
insuranceScheme: form.insuranceScheme,
onJobFlag: form.onJobFlag,
gender: form.gender,
@@ -578,6 +595,9 @@
function handleBack() {
closeViewPush(route, {
name: fromRoute ?? 'Home',
+ params: {
+ id: routeId,
+ },
});
}
</script>
--
Gitblit v1.9.1