From 3f4d122ac2da38b068e31c210acc455b0388c211 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 16:52:05 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 44 +++++++++++++++++-----
src/services/api/typings.d.ts | 29 ++++++++++++++
src/views/ServiceChargeManage/ServiceChargeManage.vue | 15 ++++---
src/views/ServiceChargeManage/components/SettleDetailDialog.vue | 7 ++-
src/views/UserManage/components/ResetOperatorPasswordDialog.vue | 8 +++
src/views/UserManage/components/AddOrEditUserDialog.vue | 12 ++++-
6 files changed, 90 insertions(+), 25 deletions(-)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 3415010..b417c8a 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -243,6 +243,8 @@
id?: string;
/** 鏄惁瀵煎叆鐢ㄦ埛 */
isImport?: boolean;
+ /** 鎿嶄綔浠ょ墝 */
+ operatorToken?: string;
}
interface APIgetTaskEnterpriseParams {
@@ -5654,6 +5656,7 @@
}
interface GetSettlementTasksQueryResult {
+ objectData?: GetSettlementTasksQueryResultObjectData;
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetSettlementTasksQueryResultItem[];
@@ -5686,6 +5689,15 @@
/** 缁撶畻浜烘暟 */
settlementUserCount?: number;
auditStatus?: EnumTaskSettlementAuditStatus;
+ }
+
+ interface GetSettlementTasksQueryResultObjectData {
+ /** 寰呭鏍� */
+ waitAuditCount?: number;
+ /** 宸插鏍� */
+ completedAuditCount?: number;
+ /** 宸插彂鏀� */
+ completedReleaseCount?: number;
}
interface GetSettlementTaskUsersQueryResult {
@@ -5725,6 +5737,13 @@
settlementStatus?: EnumTaskSettlementStatus;
/** 缁撶畻鏃堕棿 */
settlementTime?: string;
+ auditStatus?: EnumTaskSettlementAuditStatus;
+ /** 瀹℃牳澶囨敞 */
+ auditRemark?: string;
+ /** 瀹℃牳鏃堕棿 */
+ auditTime?: string;
+ /** 瀹℃牳鎿嶄綔浜� */
+ auditOperator?: string;
/** 澶囨敞 */
settlementRemark?: string;
}
@@ -5736,12 +5755,20 @@
taskInfoUserId?: string;
/** 鐢ㄦ埛淇℃伅Id */
userId?: string;
+ /** 澶村儚 */
+ avatar?: string;
/** 濮撳悕 */
name?: string;
/** 韬唤璇佸彿 */
identity?: string;
/** 鎵嬫満鍙� */
contactPhoneNumber?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
/** 绱宸ユ椂 */
totalWorkHours?: number;
/** 鎵�灞為摱琛� */
@@ -7283,7 +7310,7 @@
/** 浠诲姟鍦扮偣鍚嶇О */
addressName: string;
/** 浠诲姟鍦扮偣璇︾粏鍦板潃 */
- addressDetail: string;
+ addressDetail?: string;
/** 缁忓害 */
longitude?: number;
/** 绾害 */
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index 1a8e273..2046563 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -91,6 +91,20 @@
<div class="chuck-add-or-edit-actions">
<el-button class="chuck-add-or-edit-actions" @click="handleBack">鍙栨秷</el-button>
<el-button
+ v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >缁撶畻鐢宠</el-button
+ >
+ <el-button
+ v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Pass"
+ class="chuck-add-or-edit-actions"
+ type="primary"
+ @click="handleSubmit()"
+ >鎻愪氦缁撶畻</el-button
+ >
+ <el-button
v-if="isSettlement"
class="chuck-add-or-edit-actions"
type="primary"
@@ -134,7 +148,7 @@
import EditAccountInfoDialog from './components/EditAccountInfoDialog.vue';
import SettleDetailDialog from './components/SettleDetailDialog.vue';
import { Message } from '@bole-core/core';
-import { SettlementReceiveStatusText } from '@/constants';
+import { SettlementReceiveStatusText, EnumTaskSettlementAuditStatus } from '@/constants';
import {
downloadFile,
downloadFileByUrl,
@@ -168,7 +182,7 @@
const route = useRoute();
const id = (route.params.id as string) ?? '';
const settlement = (route.query.settlement as string) ?? '';
-const settlementAccess = route.query.settlementAccess ?? '';
+// const settlementAccess = route.query.settlementAccess ?? '';
const isSettlement = computed(() => !!settlement);
const form = reactive({
@@ -182,7 +196,10 @@
settlementUrl: [] as UploadUserFile[],
- settlementAccess: settlementAccess,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ isSettlement: isSettlement.value,
+
+ auditStatus: '' as any as EnumTaskSettlementAuditStatus,
});
const BaseState = {
@@ -192,13 +209,16 @@
const state = reactive({ ...BaseState });
const { isLoading, refetch } = useQuery({
- queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'settlementAccess')],
+ queryKey: ['taskUserServices/getSettlementTaskUsers', id, toRef(form, 'isSettlement')],
queryFn: async () => {
let params: API.APIgetSettlementTaskUsersParams = {
id: id,
};
- if (form.settlementAccess) {
- params.settlementAccess = Number(form.settlementAccess);
+ // if (form.settlementAccess) {
+ // params.settlementAccess = Number(form.settlementAccess);
+ // }
+ if (form.isSettlement) {
+ params.isImport = true;
}
return await taskUserServices.getSettlementTaskUsers(params, {
showLoading: false,
@@ -212,6 +232,8 @@
form.settlementAmount = res?.detail?.settlementAmount ?? 0;
form.actualSettlementAmount = res?.detail?.actualSettlementAmount ?? 0;
form.code = res?.detail?.code;
+ form.settlementAccess = res?.detail?.settlementAccess;
+ form.auditStatus = res?.detail?.auditStatus;
// form.settlementOrderName = setOssFileName(res?.detail?.settlementOrderName);
// form.settlementOrderTime = res?.detail?.settlementOrderTime ?? '';
}
@@ -295,7 +317,7 @@
receiveAccount: '',
bank: '',
totalWorkHours: null as number,
- settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ settlementAccess: form.settlementAccess,
// bankBranch: '',
},
});
@@ -309,7 +331,7 @@
receiveAccount: row?.receiveAccount ?? '',
bank: row?.bank ?? '',
totalWorkHours: null as number,
- settlementAccess: Number(form.settlementAccess),
+ settlementAccess: form.settlementAccess,
// bankBranch: row?.bankBranch ?? '',
});
}
@@ -329,7 +351,7 @@
let res = await taskServices.editTaskSettlementOrderRoster(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- form.settlementAccess = '';
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
}
@@ -351,7 +373,7 @@
let res = await taskServices.importTaskSettlementOrderRosters(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
- form.settlementAccess = '';
+ form.isSettlement = false;
refetch();
getList(paginationState.pageIndex);
if (res?.errors?.length > 0) {
@@ -387,6 +409,7 @@
code: form.code,
settlementUserCount: form.settlementTaskUsers.length,
actualSettlementAmount: form.actualSettlementAmount,
+ settlementAccess: form.settlementAccess,
});
}
@@ -402,6 +425,7 @@
code: '',
settlementUserCount: 0,
actualSettlementAmount: 0,
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
},
});
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index ceb3bee..dd1e7b6 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -433,17 +433,18 @@
});
function openSettleMethodDialog(row: API.GetSettlementTasksQueryResultItem) {
- handleSettlMethodAdd({
- id: row.id,
- settlementAccess: '' as any as EnumEnterpriseWalletAccess,
- });
+ // handleSettlMethodAdd({
+ // id: row.id,
+ // settlementAccess: '' as any as EnumEnterpriseWalletAccess,
+ // });
+ goDetail(row.id, 'settlement');
}
async function handleSettlMethod() {
- goDetail(settlMethodEditForm.id, 'settlement', settlMethodEditForm.settlementAccess);
+ goDetail(settlMethodEditForm.id, 'settlement');
}
-function goDetail(id: string, settlement?: string, settlementAccess?: EnumEnterpriseWalletAccess) {
+function goDetail(id: string, settlement?: string) {
router.push({
name: 'ServiceChargeDetail',
params: {
@@ -451,7 +452,7 @@
},
query: {
settlement: settlement ? settlement : '',
- settlementAccess: settlementAccess ? settlementAccess : '',
+ // settlementAccess: settlementAccess ? settlementAccess : '',
},
});
}
diff --git a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
index 37f9a14..2876584 100644
--- a/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
+++ b/src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -21,14 +21,15 @@
<ProFormInputNumber v-model="form.actualSettlementAmount" unit="鍏�" format-value="money">
</ProFormInputNumber>
</ProFormItemV2>
- <!-- <ProFormItemV2
+ <ProFormItemV2
label="缁撶畻鏂瑰紡锛�"
prop="settlementAccess"
+ mode="read"
:check-rules="[{ message: '璇烽�夋嫨缁撶畻鏂瑰紡' }]"
>
<ProFormSelect v-model="form.settlementAccess" :valueEnum="settlementAccessList">
</ProFormSelect>
- </ProFormItemV2> -->
+ </ProFormItemV2>
</ProForm>
<template #footer>
<span class="dialog-footer">
@@ -62,7 +63,7 @@
code: string;
settlementUserCount: number;
actualSettlementAmount: number;
- // settlementAccess: EnumEnterpriseWalletAccess;
+ settlementAccess: EnumEnterpriseWalletAccess;
};
const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
diff --git a/src/views/UserManage/components/AddOrEditUserDialog.vue b/src/views/UserManage/components/AddOrEditUserDialog.vue
index 64d1da5..62fcf6a 100644
--- a/src/views/UserManage/components/AddOrEditUserDialog.vue
+++ b/src/views/UserManage/components/AddOrEditUserDialog.vue
@@ -26,16 +26,22 @@
prop="password"
:check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�' }]"
>
- <ProFormText placeholder="璇疯緭鍏ヨ处鍙�" v-model.trim="innerForm.password"></ProFormText>
+ <ProFormText placeholder="璇疯緭鍏ュ瘑鐮�" v-model.trim="innerForm.password"></ProFormText>
</ProFormItemV2>
<ProFormItemV2
v-if="!isEdit"
label="鎿嶄綔瀵嗙爜"
prop="operatorPassword"
- :check-rules="[{ message: '璇疯緭鍏ユ搷浣滃瘑鐮�' }]"
+ :check-rules="[
+ { message: '璇疯緭鍏ユ搷浣滃瘑鐮�' },
+ {
+ message: '璇疯緭鍏�6浣嶆暟瀛�',
+ pattern: /\b\d{6}\b/,
+ },
+ ]"
>
<ProFormText
- placeholder="璇疯緭鍏ヨ处鍙�"
+ placeholder="璇疯緭鍏ユ搷浣滃瘑鐮�"
v-model.trim="innerForm.operatorPassword"
></ProFormText>
</ProFormItemV2>
diff --git a/src/views/UserManage/components/ResetOperatorPasswordDialog.vue b/src/views/UserManage/components/ResetOperatorPasswordDialog.vue
index 855e9a3..cd7be05 100644
--- a/src/views/UserManage/components/ResetOperatorPasswordDialog.vue
+++ b/src/views/UserManage/components/ResetOperatorPasswordDialog.vue
@@ -11,7 +11,13 @@
<ProFormItemV2
label="鎿嶄綔瀵嗙爜:"
prop="operatorPassword"
- :check-rules="[{ message: '璇疯緭鍏ユ搷浣滃瘑鐮�' }]"
+ :check-rules="[
+ { message: '璇疯緭鍏ユ搷浣滃瘑鐮�' },
+ {
+ message: '璇疯緭鍏�6浣嶆暟瀛�',
+ pattern: /\b\d{6}\b/,
+ },
+ ]"
>
<ProFormText
placeholder="璇疯緭鍏ユ搷浣滃瘑鐮�"
--
Gitblit v1.9.1