diff --git a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts index ea2e3fac..302bca92 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts @@ -94,6 +94,10 @@ export interface WorkOrdersVO { * 备注 */ remark: string; + /** + * 图片 + */ + orderImgUrl: string; } diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts index 5750e1e1..7b5732cf 100644 --- a/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts +++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts @@ -32,20 +32,59 @@ export interface TaskDetailVO { patrolType: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType: string; + /** + * 实际巡检时间 + */ + actualInspectionTime: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState: string; /** - * 巡检照片 + * 巡检图片 */ - inspectionImag -e: string; + inspectionImage: string; + + /** + * 计划巡检人 + */ + planInspectionPerson: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson: string; + + /** + * 任务状态 + */ + taskStatus: string; + + /** + * 巡检结果 + */ + inspectionResults: string; + + /** + * 巡检描述 + */ + inspectionDesc: string; + + /** + * 巡检位置 + */ + inspectionLocation: string; /** * 实际巡检时间 @@ -67,6 +106,11 @@ e: string; */ pointEndTime: string; + /** + * 搜索值 + */ + searchValue: string; + } export interface TaskDetailForm extends BaseEntity { @@ -101,20 +145,60 @@ export interface TaskDetailForm extends BaseEntity { patrolType?: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType?: string; + /** + * 实际巡检时间 + */ + actualInspectionTime?: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState?: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState?: string; /** - * 巡检照片 + * 巡检图片 */ inspectionImage?: string; + /** + * 计划巡检人 + */ + planInspectionPerson?: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson?: string; + + /** + * 任务状态 + */ + taskStatus?: string; + + /** + * 巡检结果 + */ + inspectionResults?: string; + + /** + * 巡检描述 + */ + inspectionDesc?: string; + + /** + * 巡检位置 + */ + inspectionLocation?: string; + /** * 实际巡检时间 */ @@ -135,6 +219,11 @@ export interface TaskDetailForm extends BaseEntity { */ pointEndTime?: string; + /** + * 搜索值 + */ + searchValue?: string; + } export interface TaskDetailQuery extends PageQuery { @@ -164,20 +253,59 @@ export interface TaskDetailQuery extends PageQuery { patrolType?: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType?: string; + /** + * 实际巡检时间 + */ + actualInspectionTime?: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState?: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState?: string; /** - * 巡检照片 + * 巡检图片 */ - inspectionImag -e?: string; + inspectionImage?: string; + + /** + * 计划巡检人 + */ + planInspectionPerson?: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson?: string; + + /** + * 任务状态 + */ + taskStatus?: string; + + /** + * 巡检结果 + */ + inspectionResults?: string; + + /** + * 巡检描述 + */ + inspectionDesc?: string; + + /** + * 巡检位置 + */ + inspectionLocation?: string; /** * 实际巡检时间 @@ -194,6 +322,11 @@ e?: string; */ pointEndTime?: string; + /** + * 搜索值 + */ + searchValue?: string; + /** * 日期范围参数 */ diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts index 0b7b199a..0239fe09 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -51,6 +51,16 @@ export const columns: VxeGridProps['columns'] = [ field: 'typeName', minWidth: 150, }, + { + title: '上报类型', + field: 'reportingType', + slots: { + default: ({row}) => { + return renderDict(row.reportingType, 'wy_gdsblx'); + }, + }, + width: 100, + }, { title: '派单时间', field: 'dispatchTime', @@ -164,6 +174,15 @@ export const modalSchema: FormSchemaGetter = () => [ }, rules: 'selectRequired', }, + { + label: '上报类型', + fieldName: 'reportingType', + component: 'Select', + componentProps: { + options: getDictOptions('wy_gdsblx'), + }, + rules: 'selectRequired', + }, // { // label: '状态', // fieldName: 'status', @@ -206,6 +225,7 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'location', component: 'Input', rules: 'selectRequired', + formItemClass:'col-span-2' }, // { // label: '计划完成时间', @@ -234,6 +254,7 @@ export const modalSchema: FormSchemaGetter = () => [ label: '备注', fieldName: 'remark', component: 'Textarea', + formItemClass:'col-span-2' }, // { // label: '是否超时', diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue index 95c8420c..2d2f06f0 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue @@ -42,7 +42,7 @@ async function handleOpenChange(open: boolean) { - - - - - - - - - - + - + +