From 46ee986a9a9fc5fc6a17f2fea5cf3914f6469dff Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Thu, 31 Jul 2025 14:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workOrderPending/data.ts | 14 ++- .../workOrderPending/work-orders-detail.vue | 10 +- .../workOrderProcessed/data.ts | 20 +++- .../workOrderProcessed/work-orders-detail.vue | 12 +- .../businessManagement/workOrders/data.ts | 62 +++++++---- .../workOrders/work-orders-detail.vue | 14 ++- .../visitorInvitation/data.ts | 104 +++++++++--------- .../visitorInvitation-detail.vue | 22 ++-- .../visitorManagement/visitorTodo/data.ts | 56 +++++----- .../visitorTodo/visitorTodo-detail.vue | 22 ++-- 10 files changed, 194 insertions(+), 142 deletions(-) diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts index adc44a39..3cdf6882 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrderPending/data.ts @@ -41,9 +41,19 @@ export const columns: VxeGridProps['columns'] = [ title: '地址', field: 'location', }, + // { + // title: '计划完成时间', + // field: 'planCompleTime', + // }, { - title: '计划完成时间', - field: 'planCompleTime', + title: '创建时间', + field: 'createTime', + width: 100, + }, + { + title: '备注', + field: 'remark', + width: 100, }, { field: 'action', diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue index d8c90fc9..087bbf75 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrderPending/work-orders-detail.vue @@ -58,8 +58,14 @@ async function handleOpenChange(open: boolean) { {{ orderDetail.location }} - - {{ orderDetail.planCompleTime }} + + {{ orderDetail.createTime }} + + + + + + {{ orderDetail.remark }} diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts index 58cdb57b..d88cc3c0 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/data.ts @@ -53,11 +53,11 @@ export const columns: VxeGridProps['columns'] = [ field: 'location', width: 100, }, - { - title: '计划完成时间', - field: 'planCompleTime', - width: 100, - }, + // { + // title: '计划完成时间', + // field: 'planCompleTime', + // width: 100, + // }, { title: '完成时间', field: 'compleTime', @@ -87,6 +87,16 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, + { + title: '创建时间', + field: 'createTime', + width: 100, + }, + { + title: '备注', + field: 'remark', + width: 100, + }, { field: 'action', fixed: 'right', diff --git a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue index 96151986..5c83a2da 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrderProcessed/work-orders-detail.vue @@ -64,12 +64,15 @@ async function handleOpenChange(open: boolean) { {{ orderDetail.location }} - - {{ orderDetail.planCompleTime }} - + + + {{ orderDetail.compleTime }} + + {{ orderDetail.createTime }} + @@ -78,6 +81,9 @@ async function handleOpenChange(open: boolean) { :is="orderDetail.isTimeOut ? renderDict(orderDetail.isTimeOut,'wy_sf') : ''" /> + + {{ orderDetail.remark }} + 处理记录 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 c5185488..e25fafe2 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -64,10 +64,20 @@ export const columns: VxeGridProps['columns'] = [ width: 100, }, { - title: '计划完成时间', - field: 'planCompleTime', + title: '处理权重', + field: 'processingWeight', + slots: { + default: ({row}) => { + return renderDict(row.processingWeight, 'pro_processing_weight'); + }, + }, width: 100, }, + // { + // title: '计划完成时间', + // field: 'planCompleTime', + // width: 100, + // }, { title: '完成时间', field: 'compleTime', @@ -85,7 +95,6 @@ export const columns: VxeGridProps['columns'] = [ }); }, }, - }, { title: '是否超时', @@ -94,10 +103,19 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: ({row}) => { return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : ''; - }, }, }, + { + title: '创建时间', + field: 'createTime', + width: 100, + }, + { + title: '备注', + field: 'remark', + width: 100, + }, { field: 'action', fixed: 'right', @@ -173,18 +191,18 @@ export const modalSchema: FormSchemaGetter = () => [ component: 'Input', rules: 'selectRequired', }, - { - label: '计划完成时间', - fieldName: 'planCompleTime', - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - labelWidth: 110, - rules: 'selectRequired', - }, + // { + // label: '计划完成时间', + // fieldName: 'planCompleTime', + // component: 'DatePicker', + // componentProps: { + // showTime: true, + // format: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'YYYY-MM-DD HH:mm:ss', + // }, + // labelWidth: 110, + // rules: 'selectRequired', + // }, // { // label: '完成时间', // fieldName: 'compleTime', @@ -196,12 +214,12 @@ export const modalSchema: FormSchemaGetter = () => [ // }, // rules: 'selectRequired', // }, - // { - // label: '评价', - // fieldName: 'serviceEvalua', - // component: 'Rate', - // rules: 'required', - // }, + { + label: '备注', + fieldName: 'remarkremark', + component: 'Textarea', + rules: 'required', + }, // { // label: '是否超时', // fieldName: 'isTimeOut', 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 abdd4c3e..60621630 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 @@ -64,13 +64,16 @@ async function handleOpenChange(open: boolean) { {{ orderDetail.location }} - - {{ orderDetail.planCompleTime }} - + + + {{ orderDetail.compleTime }} - + + {{ orderDetail.createTime }} + + @@ -78,6 +81,9 @@ async function handleOpenChange(open: boolean) { :is="orderDetail.isTimeOut ? renderDict(orderDetail.isTimeOut,'wy_sf') : ''" /> + + {{ orderDetail.remark }} + 处理记录 diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts index 9aee049e..abe88315 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts +++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts @@ -1,7 +1,5 @@ import type { FormSchemaGetter } from '#/adapter/form'; import type { VxeGridProps } from '#/adapter/vxe-table'; -import { getDictOptions } from '#/utils/dict'; -import { renderDict } from '#/utils/render'; export const querySchema: FormSchemaGetter = () => [ { @@ -19,14 +17,14 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'interviewedUnit', label: '邀约单位', }, - { - component: 'Select', - componentProps: { - options: getDictOptions('wy_appointment_tatus'), - }, - fieldName: 'serveStatus', - label: '预约状态', - }, + // { + // component: 'Select', + // componentProps: { + // options: getDictOptions('wy_appointment_tatus'), + // }, + // fieldName: 'serveStatus', + // label: '预约状态', + // }, ]; export const columns: VxeGridProps['columns'] = [ @@ -64,7 +62,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'interviewedUnit', }, { - title: '拜访事由', + title: '事由', field: 'visitingReason', }, { @@ -78,24 +76,24 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - { - title: '是否预约车位', - field: 'bookingParkingSpace', - slots: { - default: ({ row }) => { - return renderDict(row.bookingParkingSpace, 'wy_parking_spot'); - }, - }, - }, - { - title: '预约状态', - field: 'serveStatus', - slots: { - default: ({ row }) => { - return renderDict(row.serveStatus, 'wy_appointment_tatus'); - }, - }, - }, + // { + // title: '是否预约车位', + // field: 'bookingParkingSpace', + // slots: { + // default: ({ row }) => { + // return renderDict(row.bookingParkingSpace, 'wy_parking_spot'); + // }, + // }, + // }, + // { + // title: '预约状态', + // field: 'serveStatus', + // slots: { + // default: ({ row }) => { + // return renderDict(row.serveStatus, 'wy_appointment_tatus'); + // }, + // }, + // }, { title: '提交时间', field: 'createTime', @@ -150,7 +148,7 @@ export const modalSchema: FormSchemaGetter = () => [ rules: 'required', }, { - label: '拜访事由', + label: '事由', fieldName: 'visitingReason', component: 'Input', rules: 'required', @@ -169,29 +167,29 @@ export const modalSchema: FormSchemaGetter = () => [ }, rules: 'required', }, - { - label: '预约车位', - fieldName: 'bookingParkingSpace', - component: 'RadioGroup', - componentProps: { - options: [ - { label: '否', value: '1' }, - { label: '是', value: '0' }, - ], - }, - rules: 'required', - }, - { - label: '车牌号', - fieldName: 'licensePlate', - component: 'Input', - rules: 'required', - dependencies: { - // 类型不为按钮时显示 - show: (values) => values.bookingParkingSpace === '0', - triggerFields: ['bookingParkingSpace'], - }, - }, + // { + // label: '预约车位', + // fieldName: 'bookingParkingSpace', + // component: 'RadioGroup', + // componentProps: { + // options: [ + // { label: '否', value: '1' }, + // { label: '是', value: '0' }, + // ], + // }, + // rules: 'required', + // }, + // { + // label: '车牌号', + // fieldName: 'licensePlate', + // component: 'Input', + // rules: 'required', + // dependencies: { + // // 类型不为按钮时显示 + // show: (values) => values.bookingParkingSpace === '0', + // triggerFields: ['bookingParkingSpace'], + // }, + // }, // { // label: '人脸图片', // fieldName: 'facePictures', diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue index f0b00ecf..53bb98d1 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue +++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue @@ -53,25 +53,25 @@ async function handleOpenChange(open: boolean) { {{ visitorInvitationDetail.interviewedUnit }} - + {{ visitorInvitationDetail.visitingReason }} {{ visitorInvitationDetail.visitingBeginTime+' - '+visitorInvitationDetail.visitingBeginTime }} - - - + + + + + {{ visitorInvitationDetail.licensePlate }} - - - + + + + + {{ visitorInvitationDetail.createTime }} diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts index 474139eb..03cc4caa 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts +++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/data.ts @@ -1,7 +1,5 @@ import type { FormSchemaGetter } from '#/adapter/form'; import type { VxeGridProps } from '#/adapter/vxe-table'; -import { getDictOptions } from '#/utils/dict'; -import { renderDict } from '#/utils/render'; export const querySchema: FormSchemaGetter = () => [ { @@ -19,14 +17,14 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'interviewedUnit', label: '被访单位', }, - { - component: 'Select', - componentProps: { - options: getDictOptions('wy_appointment_tatus'), - }, - fieldName: 'serveStatus', - label: '预约状态', - }, + // { + // component: 'Select', + // componentProps: { + // options: getDictOptions('wy_appointment_tatus'), + // }, + // fieldName: 'serveStatus', + // label: '预约状态', + // }, // { // component: 'RangePicker', // componentProps: { @@ -87,7 +85,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'interviewedUnit', }, { - title: '拜访事由', + title: '事由', field: 'visitingReason', }, { @@ -101,24 +99,24 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - { - title: '是否预约车位', - field: 'bookingParkingSpace', - slots: { - default: ({ row }) => { - return renderDict(row.bookingParkingSpace, 'wy_parking_spot'); - }, - }, - }, - { - title: '预约状态', - field: 'serveStatus', - slots: { - default: ({ row }) => { - return renderDict(row.serveStatus, 'wy_appointment_tatus'); - }, - }, - }, + // { + // title: '是否预约车位', + // field: 'bookingParkingSpace', + // slots: { + // default: ({ row }) => { + // return renderDict(row.bookingParkingSpace, 'wy_parking_spot'); + // }, + // }, + // }, + // { + // title: '预约状态', + // field: 'serveStatus', + // slots: { + // default: ({ row }) => { + // return renderDict(row.serveStatus, 'wy_appointment_tatus'); + // }, + // }, + // }, { title: '提交时间', field: 'updateTime', diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue index 7f25c50a..828a3df9 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue +++ b/apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue @@ -53,25 +53,25 @@ async function handleOpenChange(open: boolean) { {{ visitorTodoDetail.interviewedUnit }} - + {{ visitorTodoDetail.visitingReason }} {{ visitorTodoDetail.visitingBeginTime+' - '+visitorTodoDetail.visitingBeginTime }} - - - + + + + + {{ visitorTodoDetail.licensePlate }} - - - + + + + + {{ visitorTodoDetail.createTime }}