| src/services/api/typings.d.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/ServiceChargeManage/ServiceChargeDetail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/ServiceChargeManage/ServiceChargeManage.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/UserManage/components/AddOrEditUserDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/UserManage/components/ResetOperatorPasswordDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; /** 纬度 */ 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) { 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 : '', }, }); } src/views/UserManage/components/AddOrEditUserDialog.vue
@@ -32,7 +32,13 @@ v-if="!isEdit" label="操作密码" prop="operatorPassword" :check-rules="[{ message: '请输入操作密码' }]" :check-rules="[ { message: '请输入操作密码' }, { message: '请输入6位数字', pattern: /\b\d{6}\b/, }, ]" > <ProFormText placeholder="请输入账号" 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="请输入操作密码"
