From 1f2956581a18283f1d4b753af5a0193971b1db2e Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 26 十二月 2025 09:19:13 +0800
Subject: [PATCH] fix: 甲方小程序
---
packages/services/apiV2/index.ts | 4
apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue | 22 +++
packages/services/apiV2/standardOrder.ts | 18 +++
packages/services/apiV2/typings.d.ts | 236 +++++++++++++++++++++++++++++++++++++--
packages/services/apiV2/taskUser.ts | 51 ++++++++
5 files changed, 316 insertions(+), 15 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index 7855001..a5c9ec9 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
@@ -58,6 +58,21 @@
></ChooseInputWithDatePicker>
</nut-form-item>
<nut-form-item
+ label="鏈嶅姟鏈烘瀯:"
+ class="bole-form-item"
+ prop="supplierEnterpriseId"
+ label-width="90px"
+ >
+ <ChooseInputWithDatePicker
+ v-model="form.endTime"
+ :minDate="endMinTime"
+ :maxDate="endMaxTime"
+ placeholder="璇烽�夋嫨"
+ type="datetime"
+ format="YYYY-MM-DD HH:mm:ss"
+ ></ChooseInputWithDatePicker>
+ </nut-form-item>
+ <nut-form-item
label="澶囨敞:"
class="bole-form-item alignTop"
prop="remark"
@@ -120,7 +135,7 @@
beginTime: '',
endTime: '',
supplierEnterpriseId: '',
- enterpriseEmployeeIds: [] as string[],
+ enterpriseEmployeeId: '',
remark: '',
});
@@ -271,6 +286,11 @@
.addStandardOrder-form {
.nut-cell-group__wrap {
box-shadow: none;
+
+ .input-text,
+ .h5-textarea {
+ text-align: right !important;
+ }
}
}
}
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 74abc28..10b88c6 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -14,11 +14,11 @@
import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
import * as taskCheckReceive from './taskCheckReceive';
+import * as taskUser from './taskUser';
import * as standardOrder from './standardOrder';
import * as standardService from './standardService';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskUser from './taskUser';
import * as enterpriseInsuranceProduct from './enterpriseInsuranceProduct';
import * as eventUtils from './eventUtils';
import * as enterpriseCooperationWallet from './enterpriseCooperationWallet';
@@ -45,11 +45,11 @@
logRecords,
dictionary,
taskCheckReceive,
+ taskUser,
standardOrder,
standardService,
userResume,
auth,
- taskUser,
enterpriseInsuranceProduct,
eventUtils,
enterpriseCooperationWallet,
diff --git a/packages/services/apiV2/standardOrder.ts b/packages/services/apiV2/standardOrder.ts
index e71a5e6..0361654 100644
--- a/packages/services/apiV2/standardOrder.ts
+++ b/packages/services/apiV2/standardOrder.ts
@@ -98,6 +98,24 @@
});
}
+/** 鏌ヨ鏍囧噯璁㈠崟璇︽儏 GET /api/flexjob/standardOrder/getSureStandardOrder */
+export async function getSureStandardOrder(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetSureStandardOrderParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetSureStandardOrderQueryResult>(
+ '/api/flexjob/standardOrder/getSureStandardOrder',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏍囧噯璁㈠崟鏀粯 POST /api/flexjob/standardOrder/payStandardOrder */
export async function payStandardOrder(
body: API.PayStandardOrderCommand,
diff --git a/packages/services/apiV2/taskUser.ts b/packages/services/apiV2/taskUser.ts
index a66d30a..e7816d9 100644
--- a/packages/services/apiV2/taskUser.ts
+++ b/packages/services/apiV2/taskUser.ts
@@ -41,6 +41,42 @@
});
}
+/** 鏌ヨ浠诲姟瀹夋帓鐏靛伐璇︽儏 GET /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee */
+export async function getArrangeTaskEnterpriseEmployee(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetArrangeTaskEnterpriseEmployeeParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetArrangeTaskEnterpriseEmployeeQueryResult>(
+ '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployee',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ浠诲姟瀹夋帓鐏靛伐鍒楄〃 POST /api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees */
+export async function getArrangeTaskEnterpriseEmployees(
+ body: API.GetArrangeTaskEnterpriseEmployeesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetArrangeTaskEnterpriseEmployeesQueryResult>(
+ '/api/flexjob/taskUser/getArrangeTaskEnterpriseEmployees',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** B绔煡璇汉鍛樺畨鎺掑垎椤靛垪琛ㄤ俊鎭� POST /api/flexjob/taskUser/getArrangeTaskUsers */
export async function getArrangeTaskUsers(
body: API.GetArrangeTaskUsersQuery,
@@ -104,6 +140,21 @@
});
}
+/** 鏌ヨ寰呭畨鎺掍换鍔″垎椤靛垪琛� POST /api/flexjob/taskUser/getWaitArrangeTasks */
+export async function getWaitArrangeTasks(
+ body: API.GetWaitArrangeTasksQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetWaitArrangeTasksQueryResult>('/api/flexjob/taskUser/getWaitArrangeTasks', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 浠诲姟瀹夋帓 PUT /api/flexjob/taskUser/setTaskUserArrange */
export async function setTaskUserArrange(
body: API.SetTaskUserArrangeCommand,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index aeea194..18811fc 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -104,6 +104,11 @@
maxDeep?: number;
}
+ interface APIgetArrangeTaskEnterpriseEmployeeParams {
+ /** 鐏靛伐Id */
+ id?: string;
+ }
+
interface APIgetCheckReceiveTaskUserSubmitParams {
/** 鎻愪氦Id锛堢敤浜嶣绔鎴风锛� */
submitId?: string;
@@ -411,6 +416,11 @@
request?: GetSupplierEnterpriseSelectQuery;
}
+ interface APIgetSureStandardOrderParams {
+ /** 璁㈠崟Id */
+ id?: string;
+ }
+
interface APIgetTaskEnterpriseParams {
/** 浼佷笟Id */
id?: string;
@@ -2189,6 +2199,42 @@
timestamp?: number;
}
+ interface FriendlyResultGetArrangeTaskEnterpriseEmployeeQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetArrangeTaskEnterpriseEmployeeQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetArrangeTaskEnterpriseEmployeesQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetArrangeTaskEnterpriseEmployeesQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetArrangeTaskUsersQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3485,6 +3531,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetSureStandardOrderQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetSureStandardOrderQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetTaskEnterpriseQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3773,6 +3837,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetWaitArrangeTasksQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetWaitArrangeTasksQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetWxmpSettingsQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -4682,6 +4764,66 @@
quickQuery?: string;
}
+ interface GetArrangeTaskEnterpriseEmployeeQueryResult {
+ /** 鐏靛伐Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
+ /** 鍗忚璧峰鏃堕棿 */
+ contractBegin?: string;
+ /** 鍗忚缁堟鏃堕棿 */
+ contractEnd?: string;
+ /** 宸插畨鎺掍换鍔� */
+ taskInfos?: GetWaitArrangeTasksQueryResultItem[];
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQuery {
+ /** 鍏抽敭瀛楋紙濮撳悕銆佽韩浠借瘉鍙枫�佹墜鏈哄彿锛� */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetArrangeTaskEnterpriseEmployeesQueryResultItem[];
+ }
+
+ interface GetArrangeTaskEnterpriseEmployeesQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ /** 宸插畨鎺� */
+ arrangeTaskCount?: number;
+ }
+
interface GetArrangeTaskUsersQuery {
/** 浠诲姟Id */
id?: string;
@@ -7957,6 +8099,18 @@
serviceId?: string;
/** 鏈嶅姟鍚� */
serviceName?: string;
+ /** 鏈嶅姟鍗曞彿 */
+ serviceCode?: string;
+ /** 鏈嶅姟鍥剧墖 */
+ serviceFile?: string;
+ /** 涓嬪崟鐢ㄦ埛Id */
+ createdUserId?: string;
+ /** 涓嬪崟鐢ㄦ埛 */
+ createdUserName?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ createdUserContactPhoneNumber?: string;
+ /** 涓嬪崟鏃堕棿 */
+ createdTime?: string;
/** 鐢叉柟浼佷笟Id */
partyAEnterpriseId?: string;
/** 鐢叉柟浼佷笟 */
@@ -8003,12 +8157,8 @@
supplierEnterpriseId?: string;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
- /** 鏈嶅姟浜哄憳Id */
- serverId?: string;
- /** 鏈嶅姟浜哄憳濮撳悕 */
- serverName?: string;
- /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
- serverContactPhoneNumber?: string;
+ /** 鏈嶅姟浜哄憳 */
+ servers?: GetStandardOrderQueryResultServer[];
/** 澶囨敞 */
remark?: string;
payAccess?: EnumUserBankCardAccess;
@@ -8022,6 +8172,8 @@
payAmount?: number;
/** 鏀粯鏃堕棿 */
payTime?: string;
+ /** 鏀粯瀹屾垚鏃堕棿 */
+ payCompletedTime?: string;
settlementStatus?: EnumStandardOrderSettlementStatus;
serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
/** 鏈嶅姟璐� */
@@ -8032,6 +8184,15 @@
settlementAmount?: number;
}
+ interface GetStandardOrderQueryResultServer {
+ /** Id */
+ id?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ }
+
interface GetStandardOrdersQuery {
scene?: EnumGetStandardOrdersQueryScene;
/** 鍏抽敭瀛楋紙璁㈠崟鍙�/鏈嶅姟鍚嶏級 */
@@ -8065,6 +8226,14 @@
serviceName?: string;
/** 鏈嶅姟鍗曞彿 */
serviceCode?: string;
+ /** 鏈嶅姟鍥剧墖 */
+ serviceFile?: string;
+ /** 鐪佸競鍖�+璇︾粏鍦板潃+闂ㄧ墝鍙� */
+ addressDetail?: string;
+ /** 鏈嶅姟璧峰鏃堕棿 */
+ beginTime?: string;
+ /** 鏈嶅姟鎴鏃堕棿 */
+ endTime?: string;
/** 涓嬪崟鐢ㄦ埛Id */
createdUserId?: string;
/** 涓嬪崟鐢ㄦ埛 */
@@ -8082,8 +8251,10 @@
supplierEnterpriseId?: string;
/** 渚涘簲鍟� */
supplierEnterpriseName?: string;
- /** 渚涘簲鍟嗚仈绯荤數璇� */
- supplierContactPhoneNumber?: string;
+ /** 鏈嶅姟浜哄憳 */
+ serverNames?: string;
+ /** 鏈嶅姟浜哄憳鑱旂郴鐢佃瘽 */
+ serverContactPhoneNumbers?: string;
payStatus?: EnumStandardOrderPayStatus;
/** 鏀粯瀹屾垚鏃堕棿 */
payCompletedTime?: string;
@@ -8091,6 +8262,7 @@
payAmount?: number;
/** 瀹炴敹閲戦 */
receiveAmount?: number;
+ serviceFeeCollectType?: EnumEnterpriseCooperationServiceFeeCollectType;
/** 鏈嶅姟璐� */
serviceFee?: number;
settlementStatus?: EnumStandardOrderSettlementStatus;
@@ -8357,6 +8529,17 @@
signStatus?: EnumEnterpriseCooperationSignStatus;
}
+ interface GetSureStandardOrderQueryResult {
+ /** 璁㈠崟Id */
+ id?: string;
+ /** 楠屾敹瀹屾垚鏃堕棿 */
+ checkReceiveTime?: string;
+ /** 闄勪欢 */
+ files?: string[];
+ /** 澶囨敞 */
+ remark?: string;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -9119,6 +9302,37 @@
pageModel?: PagedListQueryPageModel;
}
+ interface GetWaitArrangeTasksQuery {
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
+ /** 鍏抽敭瀛楋紙浠诲姟鍚嶃�佷换鍔″崟鍙凤級 */
+ keywords?: string;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetWaitArrangeTasksQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetWaitArrangeTasksQueryResultItem[];
+ }
+
+ interface GetWaitArrangeTasksQueryResultItem {
+ /** Id */
+ id?: string;
+ /** 浠诲姟鍚嶇О */
+ name?: string;
+ /** 浠诲姟鍗曞彿 */
+ code?: string;
+ /** 鍙戝崟瀹㈡埛Id */
+ enterpriseId?: string;
+ /** 鍙戝崟瀹㈡埛 */
+ enterpriseName?: string;
+ /** 浠诲姟寮�濮嬫椂闂� */
+ beginTime?: string;
+ /** 浠诲姟缁撴潫鏃堕棿 */
+ endTime?: string;
+ }
+
type GetWxmpSettingsQuery = Record<string, any>;
interface GetWxmpSettingsQueryResult {
@@ -10610,10 +10824,8 @@
interface SureStandardOrderCommand {
/** 璁㈠崟Id */
id?: string;
- /** 璇勫垎 */
- commentStar?: number;
- /** 璇勪环 */
- commentContent?: string;
+ /** 棰勭害璁㈠崟瀹屾垚澶囨敞 */
+ appointmentCompletedRemark?: string;
}
interface SureTaskSettlementCommand {
--
Gitblit v1.10.0