Merge branch 'dev-2.2.3' of http://120.26.58.240:8888/r/JYBIndependentFront...

wupengfei

6 天以前 8a82ce3065d6169480afb3403a4854fb64078c46

Merge branch 'dev-2.2.3' of http://120.26.58.240:8888/r/JYBIndependentFront into dev-2.2.3

 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",

 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`;
// 产品保障方案

 src/router/index.ts

@@ -225,7 +225,7 @@
      },
    ],
  },
  AppType === 'jx' && {
  {
    path: '/BalanceManage',
    redirect: 'noRedirect',
    component: Layout,

 src/views/BalanceManage/components/ConsumeRecordView.vue

@@ -48,6 +48,11 @@
    name: '消费类型',
  },
  {
    id: '3-1',
    enCode: 'incomeCompanyName',
    name: '进账单位',
  },
  {
    id: '4',
    enCode: 'financeType',
    name: '资金类型',

 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,
});