97334831995a7a442af237dd44eaf3fc7edc120b..0b6b336181875f53092a0086b9d55b5d264e5c5b
4 天以前 zhengyiming
fix: bug
0b6b33 对比 | 目录
4 天以前 zhengyiming
Merge remote-tracking branch 'origin/master' into dev-1.3...
3d65c4 对比 | 目录
4 天以前 zhengyiming
fix: bug
df8feb 对比 | 目录
7 天以前 wupengfei
fix: bug
182913 对比 | 目录
已修改4个文件
77 ■■■■■ 文件已修改
src/services/api/enterpriseInsuranceProduct.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/typings.d.ts 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/System/ModuleManage.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/TaskManage/components/TaskDetailView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/enterpriseInsuranceProduct.ts
@@ -26,7 +26,7 @@
  params: API.APIgetEnterpriseInsuranceProductSelectParams,
  options?: API.RequestConfig
) {
  return request<API.SelectOptionGuidGetEnterpriseInsuranceProductSelectQueryOption[]>(
  return request<API.SelectOptionNullableGuidGetEnterpriseInsuranceProductSelectQueryOption[]>(
    '/api/flexjob/enterpriseInsuranceProduct/getEnterpriseInsuranceProductSelect',
    {
      method: 'GET',
src/services/api/typings.d.ts
@@ -3638,25 +3638,6 @@
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionGuidGetEnterpriseInsuranceProductSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    /** 数据 */
    data?: SelectOptionGuidGetEnterpriseInsuranceProductSelectQueryOption[];
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
@@ -3714,6 +3695,25 @@
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionNullableGuidGetEnterpriseInsuranceProductSelectQueryOption {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    /** 数据 */
    data?: SelectOptionNullableGuidGetEnterpriseInsuranceProductSelectQueryOption[];
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultListSelectOptionStringGetDictionaryDataSelectQueryResultOption {
    /** 跟踪Id */
    traceId?: string;
@@ -6541,6 +6541,8 @@
    code?: string;
    /** 任务名称 */
    taskName?: string;
    /** 任务单号 */
    taskCode?: string;
    /** 企业名称 */
    enterpriseName?: string;
    /** 结算日期 */
@@ -7205,6 +7207,8 @@
    /** 供应商Id */
    supplierEnterpriseId?: string;
    supplierEnterprise?: GetSupplierEnterpriseSelectQueryOptionEnterprise;
    /** 是否已配置保险 */
    isConfiguredInsurance?: boolean;
  }
  interface GetSupplierEnterpriseSelectQueryOptionEnterprise {
@@ -7306,6 +7310,10 @@
    timeoutServiceFee?: number;
    /** 总件数 */
    totalPieceQuantity?: number;
    /** 保险产品Id */
    insuranceProductId?: string;
    /** 保险产品名称 */
    insuranceProductName?: string;
    settlementCycle?: EnumSettlementCycle;
    /** 结算日期 */
    settlementDate?: number;
@@ -9038,14 +9046,6 @@
    data?: GetEnterpriseContractTemplateSelectQueryOption;
  }
  interface SelectOptionGuidGetEnterpriseInsuranceProductSelectQueryOption {
    /** 值 */
    value?: string;
    /** 标签 */
    label?: string;
    data?: GetEnterpriseInsuranceProductSelectQueryOption;
  }
  interface SelectOptionGuidGetEnterpriseWalletAccessSelectQueryOption {
    /** 值 */
    value?: string;
@@ -9070,6 +9070,14 @@
    data?: GetTaskSelectQueryOption;
  }
  interface SelectOptionNullableGuidGetEnterpriseInsuranceProductSelectQueryOption {
    /** 值 */
    value?: string;
    /** 标签 */
    label?: string;
    data?: GetEnterpriseInsuranceProductSelectQueryOption;
  }
  interface SelectOptionStringGetDictionaryDataSelectQueryResultOption {
    /** 值 */
    value?: string;
src/views/System/ModuleManage.vue
@@ -409,7 +409,7 @@
    let params: API.SaveMenuCommand = {
      userType: state.userType,
      clientType: state.clientType,
      enterpriseType: state.enterpriseType,
      // enterpriseType: state.enterpriseType,
      code: editForm.enCode,
      name: editForm.name,
      type: editForm.isMenu ? EnumMenuType.Menu : EnumMenuType.Page,
@@ -419,6 +419,9 @@
      isDisabled: !editForm.enabledMark,
      sort: editForm.sortCode,
    };
    if (state.userType === EnumUserType.Enterprise) {
      params.enterpriseType = state.enterpriseType;
    }
    if (editForm.showCacheSelect) {
      params.isCache = editForm.isCache;
    }
@@ -579,8 +582,9 @@
              group.fields = columnModuleList.map((c) => ({
                code: c.enCode,
                name: c.name,
                width: c.width.toString(),
                width: c.width ? c.width.toString() : '',
                sort: c.sortCode,
                id: c.id,
              }));
            }
            return group;
@@ -591,8 +595,9 @@
            fields: columnModuleList.map((c) => ({
              code: c.enCode,
              name: c.name,
              width: c.width.toString(),
              width: c.width ? c.width.toString() : '',
              sort: c.sortCode,
              id: c.id,
            })),
          };
          groups.push(group);
src/views/TaskManage/components/TaskDetailView.vue
@@ -47,7 +47,7 @@
              </ProFormItemV2>
            </ProFormColItem>
          </ProFormCol>
          <template v-if="form.billingMethod === EnumBillingMethod.Hour">
          <template v-if="form.billingMethod === EnumBillingMethod.Day">
            <ProFormCol>
              <ProFormColItem :span="12">
                <ProFormItemV2 label="核定工时:" prop="verifyWorkHours">