by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、bug修复
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source 
2、添加巡检明细接口
This commit is contained in:
dev_ljl
2025-07-28 17:16:27 +08:00
parent ba538a2227
commit fe78f7ad25
9 changed files with 458 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/index.ts Normal file
View File

@@ -0,0 +1,61 @@
import type { TaskDetailVO, TaskDetailForm, TaskDetailQuery } from './model';
import type { ID, IDS } from '#/api/common';
import type { PageResult } from '#/api/common';
import { commonExport } from '#/api/helper';
import { requestClient } from '#/api/request';
/**
* 查询巡检明细列表
* @param params
* @returns 巡检明细列表
*/
export function taskDetailList(params?: TaskDetailQuery) {
return requestClient.get<PageResult<TaskDetailVO>>('/property/taskDetail/list', { params });
}
/**
* 导出巡检明细列表
* @param params
* @returns 巡检明细列表
*/
export function taskDetailExport(params?: TaskDetailQuery) {
return commonExport('/property/taskDetail/export', params ?? {});
}
/**
* 查询巡检明细详情
* @param id id
* @returns 巡检明细详情
*/
export function taskDetailInfo(id: ID) {
return requestClient.get<TaskDetailVO>(`/property/taskDetail/${id}`);
}
/**
* 新增巡检明细
* @param data
* @returns void
*/
export function taskDetailAdd(data: TaskDetailForm) {
return requestClient.postWithMsg<void>('/property/taskDetail', data);
}
/**
* 更新巡检明细
* @param data
* @returns void
*/
export function taskDetailUpdate(data: TaskDetailForm) {
return requestClient.putWithMsg<void>('/property/taskDetail', data);
}
/**
* 删除巡检明细
* @param id id
* @returns void
*/
export function taskDetailRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/property/taskDetail/${id}`);
}

201
apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts vendored Normal file
View File

@@ -0,0 +1,201 @@
import type { PageQuery, BaseEntity } from '#/api/common';
export interface TaskDetailVO {
/**
* 主键id
*/
id: string | number;
/**
* 任务id
*/
taskId: string | number;
/**
* 路线id
*/
routeId: string | number;
/**
* 巡检计划id
*/
planId: string | number;
/**
* 巡检点id
*/
pointId: string | number;
/**
* 巡检方式
*/
patrolType: string;
/**
* 签到类型
*/
signType: string;
/**
* 巡检状态(0未完成,1已完成)
*/
inspectionState: string;
/**
* 巡检照片
*/
inspectionImag
e: string;
/**
* 实际巡检时间
*/
inspectionTime: string;
/**
* 备注
*/
remark: string;
/**
* 点开始时间
*/
pointStartTime: string;
/**
* 点结束时间
*/
pointEndTime: string;
}
export interface TaskDetailForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 任务id
*/
taskId?: string | number;
/**
* 路线id
*/
routeId?: string | number;
/**
* 巡检计划id
*/
planId?: string | number;
/**
* 巡检点id
*/
pointId?: string | number;
/**
* 巡检方式
*/
patrolType?: string;
/**
* 签到类型
*/
signType?: string;
/**
* 巡检状态(0未完成,1已完成)
*/
inspectionState?: string;
/**
* 巡检照片
*/
inspectionImage?: string;
/**
* 实际巡检时间
*/
inspectionTime?: string;
/**
* 备注
*/
remark?: string;
/**
* 点开始时间
*/
pointStartTime?: string;
/**
* 点结束时间
*/
pointEndTime?: string;
}
export interface TaskDetailQuery extends PageQuery {
/**
* 任务id
*/
taskId?: string | number;
/**
* 路线id
*/
routeId?: string | number;
/**
* 巡检计划id
*/
planId?: string | number;
/**
* 巡检点id
*/
pointId?: string | number;
/**
* 巡检方式
*/
patrolType?: string;
/**
* 签到类型
*/
signType?: string;
/**
* 巡检状态(0未完成,1已完成)
*/
inspectionState?: string;
/**
* 巡检照片
*/
inspectionImag
e?: string;
/**
* 实际巡检时间
*/
inspectionTime?: string;
/**
* 点开始时间
*/
pointStartTime?: string;
/**
* 点结束时间
*/
pointEndTime?: string;
/**
* 日期范围参数
*/
params?: any;
}

54
apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
View File

@@ -45,7 +45,28 @@ async function handleOpenChange(open: boolean) {
}
modalApi.modalLoading(true);
const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
groupDetail.value = await groupInfo(id,attendanceType);
const res = await groupInfo(id,attendanceType);
groupDetail.value=res;
if(res.attendanceType==0){
unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0)
checkInData.value=res.clockDateList.filter(item=>item.mustNoCheck==1)
weekdayData.value=res.weekList
weekdayData.value.forEach(item => {
if(item.shiftId){
const shift = res.attendanceList.find(i => item.shiftId == i.id);
let str = ''
if (shift.isRest) {
str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
} else {
str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
}
item.shiftValue=str
}
})
groupDetail.value.isAutomatic=true
}else {
cycleData.value=res;
}
modalApi.modalLoading(false);
}
@@ -94,6 +115,15 @@ async function showHoliday() {
size="small"
:pagination="false"
>
<template #bodyCell="{ column, record, index }">
<template v-if="column.dataIndex === 'dayOfWeek'">
<component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
</template>
<template v-if="column.dataIndex === 'shiftId'">
<span v-if="record.shiftId">{{record.shiftValue }}</span>
<span v-else>休息</span>
</template>
</template>
</Table>
<Checkbox
class="item-padding-top"
@@ -112,14 +142,15 @@ async function showHoliday() {
size="small"
:pagination="false"
>
<template #bodyCell="{ column, record, index }">
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'dateTime'">
<span v-if="record.dateType == 0">{{
record.startDate
}}</span>
dayjs(record.startDate).format('YYYY-MM-DD')
}}</span>
<span v-else>{{
record.startDate + '~' + record.endDate
}}</span>
dayjs(record.startDate).format('YYYY-MM-DD')
+ '~' + dayjs(record.endDate).format('YYYY-MM-DD')
}}</span>
</template>
</template>
</Table>
@@ -132,13 +163,14 @@ async function showHoliday() {
size="small"
:pagination="false"
>
<template #bodyCell="{ column, record, index }">
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'dateTime'">
<span v-if="record.dateType == 0">{{
record.startDate
dayjs(record.startDate).format('YYYY-MM-DD')
}}</span>
<span v-else>{{
record.startDate + '~' + record.endDate
dayjs(record.startDate).format('YYYY-MM-DD')
+ '~' + dayjs(record.endDate).format('YYYY-MM-DD')
}}</span>
</template>
</template>
@@ -169,9 +201,7 @@ async function showHoliday() {
<span>{{ '第' + (index + 1) + '天' }}</span>
</template>
<template v-if="column.dataIndex === 'shiftId'">
<!-- {{item.name+'\xa0'}}-->
<!-- <span v-if="item.isRest">{{item.startTime+'~'+item.restStartTime+'\xa0'+item.restEndTime+'~'+item.endTime}}</span>-->
<!-- <span v-else>{{item.startTime+'~'+item.endTime}}</span>-->
{{record.shiftId}}
</template>
</template>
</Table>

20
apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts
View File

@@ -82,6 +82,10 @@ export const modalSchema: FormSchemaGetter = () => [
buttonStyle: 'solid',
options: getDictOptions('wy_kqlx'),
},
dependencies:{
disabled: (formValue) => formValue.id,
triggerFields: ['id'],
},
rules: 'selectRequired',
defaultValue: '0',
},
@@ -168,17 +172,17 @@ export const modalSchema: FormSchemaGetter = () => [
export const weekdayColumns: TableColumnsType = [
{
title: '工作日',
key: 'label',
key: 'dayOfWeek',
width: 120,
align: 'center',
dataIndex: 'label'
dataIndex: 'dayOfWeek'
},
{
title: '班次',
key: 'shiftValue',
key: 'shiftId',
minWidth: 180,
align: 'center',
dataIndex: 'shiftValue'
dataIndex: 'shiftId'
},
{
title: '操作',
@@ -320,17 +324,17 @@ export const clockInModalSchema: FormSchemaGetter = () => [
export const infoWeekdayColumns: TableColumnsType = [
{
title: '工作日',
key: 'label',
key: 'dayOfWeek',
width: 120,
align: 'center',
dataIndex: 'label'
dataIndex: 'dayOfWeek'
},
{
title: '班次',
key: 'shiftValue',
key: 'shiftId',
minWidth: 180,
align: 'center',
dataIndex: 'shiftValue'
dataIndex: 'shiftId'
},
]

49
apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
View File

@@ -28,6 +28,8 @@ import checkInDate from './check-in-date.vue'
import {h} from 'vue';
import {PlusOutlined, MinusOutlined} from '@ant-design/icons-vue';
import type {ShiftVO} from "#/api/property/attendanceManagement/shiftSetting/model";
import {renderDict} from "#/utils/render";
import dayjs from "dayjs";
const emit = defineEmits<{ reload: [] }>();
const isUpdate = ref(false);
@@ -88,6 +90,26 @@ const [BasicModal, modalApi] = useVbenModal({
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await groupInfo(id, attendanceType);
record.attendanceType = record.attendanceType.toString()
if (record.attendanceType == '0') {
settingData.unCheckInData = record.clockDateList.filter(item => item.mustNoCheck == 0)
settingData.checkInData = record.clockDateList.filter(item => item.mustNoCheck == 1)
settingData.weekdayData = record.weekList
settingData.weekdayData.forEach(item => {
if(item.shiftId){
const shift = record.attendanceList.find(i => item.shiftId == i.id);
let str = ''
if (shift.isRest) {
str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
} else {
str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
}
item.shiftValue=str
}
})
} else {
}
await formApi.setValues(record);
} else {
getDictOptions('wy_kqgzr').forEach(item => {
@@ -119,7 +141,7 @@ async function handleConfirm() {
let hasError = true;
settingData.cycleData.some((item, index) => {
if (!item.scheduleId) {
hasError=false
hasError = false
message.warning('请选择周期天数对应班次。');
return;
}
@@ -331,6 +353,13 @@ function getUnCheckInData(val: any) {
:data-source="settingData.weekdayData"
size="small" :pagination="false">
<template #bodyCell="{ column, record,index }">
<template v-if="column.dataIndex==='dayOfWeek'">
<component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
</template>
<template v-if="column.dataIndex==='shiftId'">
<span v-if="record.shiftId">{{ record.shiftValue }}</span>
<span v-else>休息</span>
</template>
<template v-if="column.dataIndex==='action'">
<Button type="link" size="small" @click="changeShiftHandle(3,index)">更改班次
</Button>
@@ -364,8 +393,13 @@ function getUnCheckInData(val: any) {
</Button>
</template>
<template v-if="column.dataIndex==='dateTime'">
<span v-if="record.dateType==0">{{ record.startDate }}</span>
<span v-else>{{ record.startDate + '~' + record.endDate }}</span>
<span v-if="record.dateType == 0">{{
dayjs(record.startDate).format('YYYY-MM-DD')
}}</span>
<span v-else>{{
dayjs(record.startDate).format('YYYY-MM-DD')
+ '~' + dayjs(record.endDate).format('YYYY-MM-DD')
}}</span>
</template>
</template>
</Table>
@@ -383,8 +417,13 @@ function getUnCheckInData(val: any) {
</template>
<template #bodyCell="{ column,record,index }">
<template v-if="column.dataIndex==='dateTime'">
<span v-if="record.dateType==0">{{ record.startDate }}</span>
<span v-else>{{ record.startDate + '~' + record.endDate }}</span>
<span v-if="record.dateType == 0">{{
dayjs(record.startDate).format('YYYY-MM-DD')
}}</span>
<span v-else>{{
dayjs(record.startDate).format('YYYY-MM-DD')
+ '~' + dayjs(record.endDate).format('YYYY-MM-DD')
}}</span>
</template>
<template v-if="column.dataIndex==='action'">
<Button size="small" type="primary" shape="circle"

21
apps/web-antd/src/views/property/community/data.ts
View File

@@ -1,8 +1,9 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { getPopupContainer } from '@vben/utils';
import { getDictOptions } from '#/utils/dict';
import { DictEnum } from '@vben/constants';
import type {FormSchemaGetter} from '#/adapter/form';
import type {VxeGridProps} from '#/adapter/vxe-table';
import {getPopupContainer} from '@vben/utils';
import {getDictOptions} from '#/utils/dict';
import {DictEnum} from '@vben/constants';
import {renderDict} from "#/utils/render";
export const querySchema: FormSchemaGetter = () => [
{
@@ -24,7 +25,7 @@ export const querySchema: FormSchemaGetter = () => [
// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
// export const columns: () => VxeGridProps['columns'] = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{type: 'checkbox', width: 60},
{
title: '社区名称',
field: 'communityName',
@@ -32,7 +33,11 @@ export const columns: VxeGridProps['columns'] = [
{
title: '社区类型',
field: 'communityType',
slots: { default: 'communityType' },
slots: {
default: ({row}) => {
return renderDict(row.communityType, DictEnum.wy_sqlx)
}
},
},
{
title: '城市',
@@ -73,7 +78,7 @@ export const columns: VxeGridProps['columns'] = [
{
field: 'action',
fixed: 'right',
slots: { default: 'action' },
slots: {default: 'action'},
title: '操作',
width: 180,
},

5
apps/web-antd/src/views/property/community/index.vue
View File

@@ -177,11 +177,6 @@ function handleDownloadExcel() {
</Space>
</template>
<template #communityType="{ row }">
<Tag v-if="row.community_type == 1" color="#108ee9">园区</Tag>
<Tag v-else color="#2db7f5">小区</Tag>
</template>
</BasicTable>
<CommunityModal @reload="tableApi.query()" />
</Page>

116
apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts
View File

@@ -7,10 +7,18 @@ import {getDictOptions} from "#/utils/dict";
export const querySchema: FormSchemaGetter = () => [
// {
// component: 'Input',
// fieldName: 'actUserId',
// label: '当前巡检人',
// },
{
component: 'Input',
fieldName: 'actUserId',
label: '当前巡检人',
label: '签到类型',
fieldName: 'signType',
component: 'Select',
componentProps: {
options:getDictOptions('wy_xjqdfs')
},
},
{
component: 'Select',
@@ -24,64 +32,94 @@ export const querySchema: FormSchemaGetter = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '任务编号',
field: 'id',
width:'auto'
},
{
title: '巡检计划',
field: 'planName',
minWidth:200
},
{
title: '巡检时间范围',
field: 'planInsTime',
width:'auto'
},
// {
// title: '任务编号',
// field: 'id',
// width:'auto'
// },
// {
// title: '实际巡检时间',
// field: 'endDate',
// width:180
// title: '巡检计划',
// field: 'planName',
// minWidth:200
// },
// {
// title: '巡检时间范围',
// field: 'planInsTime',
// width:'auto'
//
// },
// // {
// // title: '实际巡检时间',
// // field: 'endDate',
// // width:180
// //
// // },
// {
// title: '签到状态',
// field: 'actInsTime',
// width:150,
// },
// {
// title: '巡检人',
// field: 'planUserName',
// width:'auto'
//
// },
// {
// title: '巡检方式',
// field: 'taskType',
// width:'auto',
// slots: {
// default: ({ row }) => {
// return renderDict(row.taskType, 'wy_xjqdfs');
// },
// },
// },
{
title: '签到状态',
field: 'actInsTime',
title: '签到类型',
field: 'signType',
width:150,
},
{
title: '巡检人',
field: 'planUserName',
width:'auto'
},
{
title: '巡检方式',
field: 'taskType',
width:'auto',
slots: {
default: ({ row }) => {
return renderDict(row.taskType, 'wy_xjqdfs');
return renderDict(row.signType, 'wy_xjqdfs');
},
},
},
{
title: '巡检状态',
field: 'status',
width:100,
width:150,
slots: {
default: ({ row }) => {
return renderDict(row.taskType, 'wy_xjzt');
return renderDict(row.inspectionState, 'wy_xjzt');
},
},
},
{
title: '巡检照片',
field: 'remark',
field: 'inspectionImage',
width:120
},
{
title: '开始时间',
field: 'pointStartTime',
width:150
},
{
title: '结束时间',
field: 'pointEndTime',
width:150
},
{
title: '实际巡检时间',
field: 'inspectionTime',
width:150
},
{
title: '备注',
field: 'remark',
minWidth:120
},
// {
// field: 'action',
// fixed: 'right',

16
apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/index.vue
View File

@@ -8,15 +8,15 @@ import {
type VxeGridProps
} from '#/adapter/vxe-table';
import {
inspectionTaskExport,
inspectionTaskList,
} from '#/api/property/inspectionManagement/inspectionTask';
import type {InspectionTaskForm} from '#/api/property/inspectionManagement/inspectionTask/model';
import {commonDownloadExcel} from '#/utils/file/download';
import inspectionDetailsModal from './inspectionDetails-modal.vue';
import {columns, querySchema} from './data';
import {
taskDetailExport,
taskDetailList
} from "#/api/property/inspectionManagement/inspectionDetail";
const formOptions: VbenFormProps = {
commonConfig: {
@@ -46,7 +46,7 @@ const gridOptions: VxeGridProps = {
proxyConfig: {
ajax: {
query: async ({page}, formValues = {}) => {
return await inspectionTaskList({
return await taskDetailList({
pageNum: page.currentPage,
pageSize: page.pageSize,
...formValues,
@@ -77,7 +77,7 @@ async function handInfo(row: Required<InspectionTaskForm>) {
}
function handleDownloadExcel() {
commonDownloadExcel(inspectionTaskExport, '巡检任务数据', tableApi.formApi.form.values, {
commonDownloadExcel(taskDetailExport, '巡检明细数据', tableApi.formApi.form.values, {
fieldMappingTime: formOptions.fieldMappingTime,
});
}
@@ -97,7 +97,7 @@ function handleDownloadExcel() {
</Space>
</template>
<template #action="{ row }">
<!-- <template #action="{ row }">-->
<!-- <Space>-->
<!-- <ghost-button-->
<!-- v-access:code="['property:inspectionTask:info']"-->
@@ -106,7 +106,7 @@ function handleDownloadExcel() {
<!-- {{ $t('pages.common.info') }}-->
<!-- </ghost-button>-->
<!-- </Space>-->
</template>
<!-- </template>-->
</BasicTable>
<InspectionDetailsModal @reload="tableApi.query()"/>
</Page>