zhengyiming
2 天以前 d33b55e5f1a22f77cb51c3da1a03a4fefccce71d
fix: 验收管理
1个文件已添加
8个文件已修改
224 ■■■■ 已修改文件
apps/bMiniApp/project.private.config.json 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Input/ChooseInputWithPicker.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/apiEnum.ts 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/enterpriseWallet.ts 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/enterpriseWallet.ts 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/user.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/project.private.config.json
@@ -1,44 +1,51 @@
{
  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "projectname": "bMiniApp",
  "setting": {
    "compileHotReLoad": true,
    "bigPackageSizeSupport": true,
    "urlCheck": false,
    "coverView": true,
    "lazyloadPlaceholderEnable": false,
    "skylineRenderEnable": false,
    "preloadBackgroundData": false,
    "autoAudits": false,
    "useApiHook": true,
    "useApiHostProcess": true,
    "showShadowRootInWxmlPanel": true,
    "useStaticServer": false,
    "useLanDebug": false,
    "showES6CompileOption": false,
    "checkInvalidKey": true,
    "ignoreDevUnusedFiles": true,
    "useIsolateContext": true
  },
  "condition": {
    "miniprogram": {
      "list": [
        {
          "name": "验收管理",
          "pathName": "subpackages/task/taskCheck/taskCheck",
          "query": "",
          "scene": null,
          "launchMode": "default"
        },
        {
          "name": "验收详情",
          "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
          "query": "id=927b9898-1e9f-4aec-99aa-08ddf4e125c9&date=2025-10-19&checkReceiveStatus=10",
          "launchMode": "default",
          "scene": null
    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
    "projectname": "bMiniApp",
    "setting": {
        "compileHotReLoad": true,
        "bigPackageSizeSupport": true,
        "urlCheck": false,
        "coverView": true,
        "lazyloadPlaceholderEnable": false,
        "skylineRenderEnable": false,
        "preloadBackgroundData": false,
        "autoAudits": false,
        "useApiHook": true,
        "useApiHostProcess": true,
        "showShadowRootInWxmlPanel": true,
        "useStaticServer": false,
        "useLanDebug": false,
        "showES6CompileOption": false,
        "checkInvalidKey": true,
        "ignoreDevUnusedFiles": true,
        "useIsolateContext": true
    },
    "condition": {
        "miniprogram": {
            "list": [
                {
                    "name": "发布任务",
                    "pathName": "subpackages/task/publishTask/publishTask",
                    "query": "",
                    "scene": null,
                    "launchMode": "default"
                },
                {
                    "name": "验收管理",
                    "pathName": "subpackages/task/taskCheck/taskCheck",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "验收详情",
                    "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
                    "query": "id=927b9898-1e9f-4aec-99aa-08ddf4e125c9&date=2025-10-19&checkReceiveStatus=10",
                    "launchMode": "default",
                    "scene": null
                }
            ]
        }
      ]
    }
  },
  "libVersion": "3.9.3"
}
    },
    "libVersion": "3.9.3"
}
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -242,6 +242,20 @@
          >
        </nut-radio-group>
      </nut-form-item>
      <nut-form-item
        label="结算方式:"
        class="bole-form-item"
        prop="settlementAccess"
        label-width="90px"
        required
      >
        <ChooseInputWithPicker
          v-model="form.settlementAccess"
          placeholder="请选择结算方式"
          :value-enum="EnumEnterpriseWalletAccessText"
          :disabled="isEdit"
        />
      </nut-form-item>
    </nut-form>
  </ContentScrollView>
  <PageFooter>
@@ -266,6 +280,8 @@
  EnumSettlementCycleDateMonthArray,
  EnumTaskCheckReceiveMethod,
  EnumTaskCheckReceiveMethodText,
  EnumEnterpriseWalletAccess,
  EnumEnterpriseWalletAccessText,
} from '@12333/constants';
import {
  ChooseInputWithPicker,
@@ -339,12 +355,14 @@
  checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
  applyBeginTime: '',
  applyEndTime: '',
  settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
const rules = reactive<FormRules>({
  name: [{ required: true, message: '请输入任务名称' }],
  genderLimit: [{ required: true, message: '请选择性别要求' }],
  settlementCycleDate: [{ required: true, message: '请设置结算日期' }],
  settlementAccess: [{ required: true, message: '请选择结算方式' }],
  // addressDetail: [{ required: true, message: '请输入详细地址' }],
  billingMethod: [
    {
@@ -450,6 +468,7 @@
    form.checkReceiveMethod = data.checkReceiveMethod;
    form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
    form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
    form.settlementAccess = data.settlementAccess;
  },
});
@@ -490,6 +509,7 @@
      checkReceiveMethod: form.checkReceiveMethod,
      applyBeginTime: dayjs(form.applyBeginTime).format('YYYY-MM-DD 00:00:00'),
      applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
      settlementAccess: form.settlementAccess,
    };
    if (isEdit) {
      params.id = taskId;
packages/components/src/Input/ChooseInputWithPicker.vue
@@ -18,11 +18,13 @@
  enumValueKey?: string;
  valueEnum?: ValueEnum;
  modelValue: string | number;
  disabled?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
  enumLabelKey: 'label',
  enumValueKey: 'value',
  disabled: false,
});
const emit = defineEmits<{
@@ -38,6 +40,9 @@
);
function handleOpen() {
  if (props.disabled) {
    return;
  }
  const _modelValue = [props.modelValue];
  Portal.add((key) => {
    return h(
packages/constants/apiEnum.ts
@@ -819,6 +819,16 @@
  Completed = 20,
}
/** 发薪状态 */
export enum GetSettlementTasksQueryPaymentStatus {
  /**待审核 */
  WaitAudit = 10,
  /**已审核 */
  CompletedAudit = 20,
  /**已发放 */
  CompletedRelease = 30,
}
/** 我的报名列表-详情-按钮类型 */
export enum GetTaskInfoQueryResultApplyButton {
  /**待确认 */
packages/constants/enterpriseWallet.ts
New file
@@ -0,0 +1,11 @@
import { EnumEnterpriseWalletAccess } from './apiEnum';
export const EnumEnterpriseWalletAccessTextOnlyAlipay = {
  [EnumEnterpriseWalletAccess.Alipay]: '支付宝',
};
export const EnumEnterpriseWalletAccessText = {
  [EnumEnterpriseWalletAccess.Alipay]: '支付宝',
  [EnumEnterpriseWalletAccess.PingAnPay]: '平安银行',
  [EnumEnterpriseWalletAccess.WeChatPay]: '微信',
};
packages/constants/index.ts
@@ -14,3 +14,4 @@
export * from './task';
export * from './apiEnum';
export * from './enterpriseEmployee';
export * from './enterpriseWallet';
packages/services/apiV2/enterpriseWallet.ts
@@ -195,6 +195,21 @@
  });
}
/** 导出企业余额详情 POST /api/user/enterpriseWallet/exportEnterpriseBalanceDetails */
export async function exportEnterpriseBalanceDetails(
  body: API.ExportEnterpriseBalanceDetailsCommand,
  options?: API.RequestConfig
) {
  return request<string>('/api/user/enterpriseWallet/exportEnterpriseBalanceDetails', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}
/** 支付宝通知回传 GET /api/user/enterpriseWallet/getAlipayNotify */
export async function getAlipayNotify(
  body: API.GetAlipayNotifyCommand,
@@ -493,18 +508,6 @@
      ...(options || {}),
    }
  );
}
/** 测试微信支付 POST /api/user/enterpriseWallet/testWeChatPay */
export async function testWeChatPay(body: API.TestWeChatPayCommand, options?: API.RequestConfig) {
  return request<boolean>('/api/user/enterpriseWallet/testWeChatPay', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}
/** 修改企业微信支付钱包结算账户 POST /api/user/enterpriseWallet/updateEnterpriseWeChatPayWalletBankAccountInfo */
packages/services/apiV2/typings.d.ts
@@ -241,8 +241,8 @@
  interface APIgetSettlementTaskUsersParams {
    /** 结算订单Id */
    id?: string;
    /** 结算通道 */
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 是否导入用户 */
    isImport?: boolean;
  }
  interface APIgetTaskEnterpriseParams {
@@ -350,6 +350,8 @@
    auditStatus?: EnumTaskSettlementAuditStatus;
    /** 审核备注 */
    auditRemark?: string;
    /** 操作令牌 */
    operatorToken?: string;
  }
  interface BaiduOcrBusinessLicenseResultModel {
@@ -1331,6 +1333,15 @@
    VERIFY_FAIL = 1,
    /**验证中,商户可发起提现尝试 */
    VERIFYING = 2,
  }
  interface ExportEnterpriseBalanceDetailsCommand {
    /** 企业钱包Id */
    enterpriseWalletId?: string;
    /** 创建时间-起始 */
    createdTimeStart?: string;
    /** 创建时间-截止 */
    createdTimeEnd?: string;
  }
  interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -3492,6 +3503,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    /** 任务地点名称 */
@@ -3544,6 +3556,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    /** 任务地点名称 */
@@ -4920,6 +4933,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    billingMethod?: EnumBillingMethod;
@@ -4969,6 +4983,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    billingMethod?: EnumBillingMethod;
@@ -5011,6 +5026,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    billingMethod?: EnumBillingMethod;
@@ -5617,6 +5633,7 @@
  interface GetSettlementTasksQuery {
    /** 关键字 */
    keywords?: string;
    paymentStatus?: GetSettlementTasksQueryPaymentStatus;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    settlementStatus?: EnumTaskSettlementStatus;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
@@ -5625,6 +5642,15 @@
    /** 结算时间-截止 */
    settlementTimeEnd?: string;
    pageModel?: PagedListQueryPageModel;
  }
  enum GetSettlementTasksQueryPaymentStatus {
    /**待审核 */
    WaitAudit = 10,
    /**已审核 */
    CompletedAudit = 20,
    /**已发放 */
    CompletedRelease = 30,
  }
  interface GetSettlementTasksQueryResult {
@@ -5659,6 +5685,7 @@
    settlementRemark?: string;
    /** 结算人数 */
    settlementUserCount?: number;
    auditStatus?: EnumTaskSettlementAuditStatus;
  }
  interface GetSettlementTaskUsersQueryResult {
@@ -5685,6 +5712,7 @@
    verifyWorkHours?: number;
    /** 超时服务费 */
    timeoutServiceFee?: number;
    settlementAccess?: EnumEnterpriseWalletAccess;
    settlementOrderStatus?: EnumTaskSettlementOrderStatus;
    /** 结算单名称 */
    settlementOrderName?: string;
@@ -5908,6 +5936,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    /** 创建时间 */
@@ -6041,6 +6070,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    releaseStatus?: EnumTaskReleaseStatus;
@@ -6860,6 +6890,13 @@
    id?: string;
  }
  interface ResetUserOperatorPasswordsCommand {
    /** Id */
    ids?: string[];
    /** 操作密码 */
    operatorPassword?: string;
  }
  interface ResetUserPasswordsCommand {
    /** Id */
    ids?: string[];
@@ -7261,6 +7298,7 @@
    applyEndTime?: string;
    checkReceiveMethod?: EnumTaskCheckReceiveMethod;
    paymentMethod?: EnumTaskPaymentMethod;
    settlementAccess?: EnumEnterpriseWalletAccess;
    /** 任务描述 */
    description?: string;
    /** Id */
@@ -7734,8 +7772,6 @@
    /** 备注 */
    remark?: string;
  }
  type TestWeChatPayCommand = Record<string, any>;
  interface UpdateEnterpriseWeChatPayWalletBankAccountInfoCommand {
    /** 企业Id */
packages/services/apiV2/user.ts
@@ -191,6 +191,21 @@
  });
}
/** 重置用户操作密码 POST /api/user/user/resetUserOperatorPasswords */
export async function resetUserOperatorPasswords(
  body: API.ResetUserOperatorPasswordsCommand,
  options?: API.RequestConfig
) {
  return request<number>('/api/user/user/resetUserOperatorPasswords', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json-patch+json',
    },
    data: body,
    ...(options || {}),
  });
}
/** 重置用户密码 POST /api/user/user/resetUserPasswords */
export async function resetUserPasswords(
  body: API.ResetUserPasswordsCommand,