From 8a82ce3065d6169480afb3403a4854fb64078c46 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 23 十月 2025 22:20:24 +0800
Subject: [PATCH] Merge branch 'dev-2.2.3' of http://120.26.58.240:8888/r/JYBIndependentFront into dev-2.2.3
---
src/views/BalanceManage/components/ConsumeRecordView.vue | 5 +++++
src/constants/temp.ts | 4 ++--
package.json | 1 +
src/router/index.ts | 2 +-
src/views/Home/components/InsureOrderInfoView.vue | 7 +++----
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 24aca29..5e989bd 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
"build:staging:jx": "cross-env VITE_AppType=jx vite build --mode staging",
"build:staging:tp": "cross-env VITE_AppType=tp vite build --mode staging",
"build:staging:jenkins": "cross-env NODE_OPTIONS=--max_old_space_size=16000 vite build --mode staging",
+ "build:staging:jx:jenkins": "cross-env NODE_OPTIONS=--max_old_space_size=16000 VITE_AppType=jx vite build --mode staging",
"build:staging:tp:jenkins": "cross-env NODE_OPTIONS=--max_old_space_size=16000 VITE_AppType=tp vite build --mode staging",
"preview": "vite preview",
"prepare": "husky install",
diff --git a/src/constants/temp.ts b/src/constants/temp.ts
index 59db30a..35c7427 100644
--- a/src/constants/temp.ts
+++ b/src/constants/temp.ts
@@ -4,9 +4,9 @@
// 瀵煎叆
export const InsuranceOrderTempPath = `${TempFolderPath}/%E9%9B%87%E4%B8%BB%E4%BA%BA%E5%91%98%E6%B8%85%E5%8D%95%E6%A8%A1%E6%9D%BF.xlsx`;
// 鍔犲噺浜�
-export const InsuranceAddOrReduceTempPath = `${TempFolderPath}/%E5%8A%A0%E5%87%8F%E4%BA%BA%E6%A8%A1%E6%9D%BF.xlsx`;
+export const InsuranceAddOrReduceTempPath = `${TempFolderPath}/%E5%8A%A0%E5%87%8F%E4%BA%BA%E6%A8%A1%E6%9D%BF-v2.xlsx`;
// 鏇挎崲浜�
-export const InsuranceChangeTempPath = `${TempFolderPath}/%E6%9B%BF%E6%8D%A2%E4%BA%BA%E6%A8%A1%E6%9D%BF%20.xlsx`;
+export const InsuranceChangeTempPath = `${TempFolderPath}/%E6%9B%BF%E6%8D%A2%E4%BA%BA%E6%A8%A1%E6%9D%BF-v2.xlsx`;
// 鑱屼笟绫诲瀷瀵圭収琛�
export const InsuranceOccupationTypeTempPath = `${TempFolderPath}/%E8%81%8C%E4%B8%9A%E7%B1%BB%E5%9E%8B%E5%AF%B9%E7%85%A7%E8%A1%A8.xls`;
// 浜у搧淇濋殰鏂规
diff --git a/src/router/index.ts b/src/router/index.ts
index 3e88bd6..81b193c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -225,7 +225,7 @@
},
],
},
- AppType === 'jx' && {
+ {
path: '/BalanceManage',
redirect: 'noRedirect',
component: Layout,
diff --git a/src/views/BalanceManage/components/ConsumeRecordView.vue b/src/views/BalanceManage/components/ConsumeRecordView.vue
index 2bc95a3..087967e 100644
--- a/src/views/BalanceManage/components/ConsumeRecordView.vue
+++ b/src/views/BalanceManage/components/ConsumeRecordView.vue
@@ -48,6 +48,11 @@
name: '娑堣垂绫诲瀷',
},
{
+ id: '3-1',
+ enCode: 'incomeCompanyName',
+ name: '杩涜处鍗曚綅',
+ },
+ {
id: '4',
enCode: 'financeType',
name: '璧勯噾绫诲瀷',
diff --git a/src/views/Home/components/InsureOrderInfoView.vue b/src/views/Home/components/InsureOrderInfoView.vue
index fba9f62..bd96540 100644
--- a/src/views/Home/components/InsureOrderInfoView.vue
+++ b/src/views/Home/components/InsureOrderInfoView.vue
@@ -91,10 +91,7 @@
</ProForm>
</ChunkCell>
<ChunkCell title="浜哄憳淇℃伅" class="full-table-chunk">
- <template
- #titleRight
- v-if="detail.status !== InsurancePolicyStatusEnum.WaitEffect && !detail.productOnline"
- >
+ <template #titleRight v-if="detail.status !== InsurancePolicyStatusEnum.WaitEffect">
<el-button type="primary" @click="handleBatchChange">鎵规敼鐢宠</el-button>
</template>
<ProTableQueryFilterBar @on-reset="reset">
@@ -613,6 +610,7 @@
productSchemeIdNumber: getInsureProductSchemeByCode(detail.value.productSchemeCode)?.idNumber,
effectStartTime: detail.value.effectStartTime,
effectEndTime: detail.value.effectEndTime,
+ isOnLineInsurance: detail.value.productOnline ?? false,
});
}
@@ -630,6 +628,7 @@
productSchemeIdNumber: '',
effectStartTime: dayjs().add(1, 'day').format('YYYY-MM-DD'),
effectEndTime: '',
+ isOnLineInsurance: false,
},
closeAfterConfirm: false,
});
--
Gitblit v1.9.1