1、巡检明细
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
dev_ljl 2025-07-15 15:39:58 +08:00
parent 1ed923c969
commit 8e361c6b59
5 changed files with 414 additions and 38 deletions

View File

@ -59,7 +59,7 @@ export interface InspectionPlanVO {
/**
*
*/
userId: string | number;
userId: string;
/**
*
@ -74,21 +74,22 @@ export interface InspectionPlanVO {
/**
*
*/
inspectionMonth?:string;
inspectionMonth?: string;
/**
*
*/
inspectionDay?:string;
inspectionDay?: string;
/**
*
*/
inspectionWorkday?:string;
inspectionWorkday?: string;
/**
*
*/
state?:string
state?: string
inspectionPlanStaffVoList?: any[]
}
export interface InspectionPlanForm extends BaseEntity {
@ -159,15 +160,15 @@ export interface InspectionPlanForm extends BaseEntity {
/**
*
*/
inspectionMonth?:string;
inspectionMonth?: string;
/**
*
*/
inspectionDay?:string;
inspectionDay?: string;
/**
*
*/
inspectionWorkday?:string;
inspectionWorkday?: string;
}
@ -234,13 +235,13 @@ export interface InspectionPlanQuery extends PageQuery {
/**
*
*/
inspectionMonth?:string;
inspectionMonth?: string;
/**
*
*/
inspectionDay?:string;
inspectionDay?: string;
/**
*
*/
inspectionWorkday?:string;
inspectionWorkday?: string;
}

View File

@ -0,0 +1,160 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import {renderDict} from "#/utils/render";
import {getDictOptions} from "#/utils/dict";
1
export const querySchema: FormSchemaGetter = () => [
{
component: 'Input',
fieldName: 'actUserId',
label: '当前巡检人',
},
{
component: 'Select',
componentProps: {
options:getDictOptions('wy_xjqdfs')
},
fieldName: 'taskType',
label: '巡检方式',
},
];
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: '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: 'status',
width:100,
slots: {
default: ({ row }) => {
return renderDict(row.taskType, 'wy_xjqdfs');
},
},
},
{
title: '巡检照片',
field: 'remark',
width:120
},
// {
// field: 'action',
// fixed: 'right',
// slots: { default: 'action' },
// title: '操作',
// width: 120,
// },
];
export const modalSchema: FormSchemaGetter = () => [
{
label: '主键id',
fieldName: 'id',
component: 'Input',
dependencies: {
show: () => false,
triggerFields: [''],
},
},
{
label: '巡检计划',
fieldName: 'planName',
component: 'Input',
},
{
label: '巡检开始日期',
fieldName: 'startDate',
component: 'Input',
},
{
label: '巡检结束日期',
fieldName: 'endDate',
component: 'Input',
},
{
label: '实际巡检时间',
fieldName: 'actInsTime',
component: 'DatePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
},
{
label: '当前巡检人',
fieldName: 'actUserId',
component: 'Input',
},
{
label: '巡检方式',
fieldName: 'taskType',
component: 'Select',
componentProps: {
},
},
{
label: '转移描述',
fieldName: 'transferDesc',
component: 'Textarea',
},
{
label: '巡检状态',
fieldName: 'status',
component: 'RadioGroup',
componentProps: {
buttonStyle: 'solid',
optionType: 'button',
},
},
{
label: '备注',
fieldName: 'remark',
component: 'Input',
},
];

View File

@ -0,0 +1,113 @@
<script setup lang="ts">
import {Page, useVbenModal, type VbenFormProps} from '@vben/common-ui';
import {Space} from 'ant-design-vue';
import {
useVbenVxeGrid,
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';
const formOptions: VbenFormProps = {
commonConfig: {
labelWidth: 80,
componentProps: {
allowClear: true,
},
},
schema: querySchema(),
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
};
const gridOptions: VxeGridProps = {
checkboxConfig: {
//
highlight: true,
//
reserve: true,
//
// trigger: 'row',
},
columns,
height: 'auto',
keepSource: true,
pagerConfig: {},
proxyConfig: {
ajax: {
query: async ({page}, formValues = {}) => {
return await inspectionTaskList({
pageNum: page.currentPage,
pageSize: page.pageSize,
...formValues,
});
},
},
},
rowConfig: {
keyField: 'id',
},
//
id: 'property-inspectionDetails-index'
};
const [BasicTable, tableApi] = useVbenVxeGrid({
formOptions,
gridOptions,
});
const [InspectionDetailsModal, modalApi] = useVbenModal({
connectedComponent: inspectionDetailsModal,
});
async function handInfo(row: Required<InspectionTaskForm>) {
detailApi.setData({id: row.id});
detailApi.open();
}
function handleDownloadExcel() {
commonDownloadExcel(inspectionTaskExport, '巡检任务数据', tableApi.formApi.form.values, {
fieldMappingTime: formOptions.fieldMappingTime,
});
}
</script>
<template>
<Page :auto-content-height="true">
<BasicTable table-title="巡检明细列表">
<template #toolbar-tools>
<Space>
<a-button
v-access:code="['property:inspectionTask:export']"
@click="handleDownloadExcel"
>
{{ $t('pages.common.export') }}
</a-button>
</Space>
</template>
<template #action="{ row }">
<!-- <Space>-->
<!-- <ghost-button-->
<!-- v-access:code="['property:inspectionTask:info']"-->
<!-- @click.stop="handInfo(row)"-->
<!-- >-->
<!-- {{ $t('pages.common.info') }}-->
<!-- </ghost-button>-->
<!-- </Space>-->
</template>
</BasicTable>
<InspectionDetailsModal @reload="tableApi.query()"/>
</Page>
</template>

View File

@ -0,0 +1,101 @@
<script setup lang="ts">
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { inspectionTaskAdd, inspectionTaskInfo, inspectionTaskUpdate } from '#/api/property/inspectionManagement/inspectionTask';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
const emit = defineEmits<{ reload: [] }>();
const isUpdate = ref(false);
const title = computed(() => {
return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
});
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
//
formItemClass: 'col-span-2',
// label px
labelWidth: 80,
//
componentProps: {
class: 'w-full',
}
},
schema: modalSchema(),
showDefaultActions: false,
wrapperClass: 'grid-cols-2',
});
const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
{
initializedGetter: defaultFormValueGetter(formApi),
currentGetter: defaultFormValueGetter(formApi),
},
);
const [BasicModal, modalApi] = useVbenModal({
//
class: 'w-[550px]',
fullscreenButton: false,
onBeforeClose,
onClosed: handleClosed,
onConfirm: handleConfirm,
onOpenChange: async (isOpen) => {
if (!isOpen) {
return null;
}
modalApi.modalLoading(true);
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await inspectionTaskInfo(id);
await formApi.setValues(record);
}
await markInitialized();
modalApi.modalLoading(false);
},
});
async function handleConfirm() {
try {
modalApi.lock(true);
const { valid } = await formApi.validate();
if (!valid) {
return;
}
// getValuesreadonly
const data = cloneDeep(await formApi.getValues());
await (isUpdate.value ? inspectionTaskUpdate(data) : inspectionTaskAdd(data));
resetInitialized();
emit('reload');
modalApi.close();
} catch (error) {
console.error(error);
} finally {
modalApi.lock(false);
}
}
async function handleClosed() {
await formApi.resetForm();
resetInitialized();
}
</script>
<template>
<BasicModal :title="title">
<BasicForm />
</BasicModal>
</template>

View File

@ -68,14 +68,14 @@ const [BasicModal, modalApi] = useVbenModal({
if (isUpdate.value && id) {
const record = await inspectionPlanInfo(id);
record.planDate = [record.startDate, record.endDate]
if(record.inspectionPlanPeriod=='1'){
record.inspectionMonth=record.inspectionMonth?.split(',')
record.inspectionDay=record.inspectionDay?.split(',')
}else {
record.inspectionWorkday=record.inspectionWorkday?.split(',')
if (record.inspectionPlanPeriod == '1') {
record.inspectionMonth = record.inspectionMonth?.split(',')
record.inspectionDay = record.inspectionDay?.split(',')
} else {
record.inspectionWorkday = record.inspectionWorkday?.split(',')
}
if(record.inspectionPlanStaffVoList&&record.inspectionPlanStaffVoList.length){
record.userId=record.inspectionPlanStaffVoList.map(item=>item.userId)
if (record.inspectionPlanStaffVoList && record.inspectionPlanStaffVoList.length) {
record.userId = record.inspectionPlanStaffVoList.map(item => item.userId)
}
await formApi.setValues(record);
}
@ -97,28 +97,28 @@ async function handleConfirm() {
if (data.planDate && data.planDate.length) {
data.startDate = data.planDate[0]
data.endDate = data.planDate[1]
data.startTime=data.planDate[0]?.split(' ')[1]
data.endTime=data.planDate[1]?.split(' ')[1]
data.startTime = data.planDate[0]?.split(' ')[1]
data.endTime = data.planDate[1]?.split(' ')[1]
}
if(data.inspectionPlanPeriod=='1'){
data.inspectionMonth=data.inspectionMonth?.join(',')
data.inspectionDay=data.inspectionDay?.join(',')
data.inspectionWorkday=undefined
}else {
data.inspectionWorkday=data.inspectionWorkday?.join(',')
data.inspectionMonth=undefined
data.inspectionDay=undefined
if (data.inspectionPlanPeriod == '1') {
data.inspectionMonth = data.inspectionMonth?.join(',')
data.inspectionDay = data.inspectionDay?.join(',')
data.inspectionWorkday = undefined
} else {
data.inspectionWorkday = data.inspectionWorkday?.join(',')
data.inspectionMonth = undefined
data.inspectionDay = undefined
}
if(data.userId){
data.inspectionPlanStaffBoList=[]
data.userId.forEach(item=>
if (data.userId) {
data.inspectionPlanStaffBoList = []
data.userId.forEach((item: any) => {
data.inspectionPlanStaffBoList.push({
userId:item,
startTime:data.startDate,
endTime:data.endDate
}))
userId: item,
startTime: data.startDate,
endTime: data.endDate
})
})
}
// data.userId=data.userId?.join(',')
await (isUpdate.value ? inspectionPlanUpdate(data) : inspectionPlanAdd(data));
resetInitialized();
emit('reload');
@ -143,7 +143,7 @@ async function queryPersonData() {
const res = await personList(params);
const options = res.rows.map((user) => ({
label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
+ '-' + user.phone+'-'+user.unitName,
+ '-' + user.phone + '-' + user.unitName,
value: user.id,
}));
formApi.updateSchema([{
@ -200,12 +200,13 @@ const filterOption = (input: string, option: any) => {
<style lang="scss" scoped>
.before-time {
display: flex;
.tail-text {
width: 100px;
font-size: 0.875rem;
font-weight: 500;
text-align: center;
line-height:32px;
line-height: 32px;
}
}