From d33b55e5f1a22f77cb51c3da1a03a4fefccce71d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 15:22:20 +0800
Subject: [PATCH] fix: 验收管理
---
packages/constants/enterpriseWallet.ts | 11 ++
packages/constants/index.ts | 1
packages/services/apiV2/enterpriseWallet.ts | 27 +++---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 20 +++++
packages/services/apiV2/typings.d.ts | 44 ++++++++++-
packages/components/src/Input/ChooseInputWithPicker.vue | 5 +
packages/constants/apiEnum.ts | 10 ++
packages/services/apiV2/user.ts | 15 +++
apps/bMiniApp/project.private.config.json | 91 ++++++++++++----------
9 files changed, 166 insertions(+), 58 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 198f283..0f61118 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/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"
+}
\ No newline at end of file
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 6087e03..86443e0 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/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;
diff --git a/packages/components/src/Input/ChooseInputWithPicker.vue b/packages/components/src/Input/ChooseInputWithPicker.vue
index 1d07b64..90c72c8 100644
--- a/packages/components/src/Input/ChooseInputWithPicker.vue
+++ b/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(
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 3d11edb..1c1c992 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -819,6 +819,16 @@
Completed = 20,
}
+/** 鍙戣柂鐘舵�� */
+export enum GetSettlementTasksQueryPaymentStatus {
+ /**寰呭鏍� */
+ WaitAudit = 10,
+ /**宸插鏍� */
+ CompletedAudit = 20,
+ /**宸插彂鏀� */
+ CompletedRelease = 30,
+}
+
/** 鎴戠殑鎶ュ悕鍒楄〃-璇︽儏-鎸夐挳绫诲瀷 */
export enum GetTaskInfoQueryResultApplyButton {
/**寰呯‘璁� */
diff --git a/packages/constants/enterpriseWallet.ts b/packages/constants/enterpriseWallet.ts
new file mode 100644
index 0000000..0bf7b97
--- /dev/null
+++ b/packages/constants/enterpriseWallet.ts
@@ -0,0 +1,11 @@
+import { EnumEnterpriseWalletAccess } from './apiEnum';
+
+export const EnumEnterpriseWalletAccessTextOnlyAlipay = {
+ [EnumEnterpriseWalletAccess.Alipay]: '鏀粯瀹�',
+};
+
+export const EnumEnterpriseWalletAccessText = {
+ [EnumEnterpriseWalletAccess.Alipay]: '鏀粯瀹�',
+ [EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰',
+ [EnumEnterpriseWalletAccess.WeChatPay]: '寰俊',
+};
diff --git a/packages/constants/index.ts b/packages/constants/index.ts
index 29e7321..5de30ac 100644
--- a/packages/constants/index.ts
+++ b/packages/constants/index.ts
@@ -14,3 +14,4 @@
export * from './task';
export * from './apiEnum';
export * from './enterpriseEmployee';
+export * from './enterpriseWallet';
diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts
index 3ad6a31..b146c99 100644
--- a/packages/services/apiV2/enterpriseWallet.ts
+++ b/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 */
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 5dac705..3415010 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/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 */
diff --git a/packages/services/apiV2/user.ts b/packages/services/apiV2/user.ts
index eb29746..00b2379 100644
--- a/packages/services/apiV2/user.ts
+++ b/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,
--
Gitblit v1.9.1