commit: 设备巡检保养模块接口联调（未完成）

@@ -12,3 +12,23 @@ export const getInspectionPlanList = (params) => {
     params: otherParams,
   });
 };
+
+/**
+ * 删除
+ */
+export const deleteInspectionPlan = (params) => {
+  return defHttp.get<any>({
+    url: `/inspectionPlan/delete`,
+    params,
+  });
+};
+
+/**
+ * 更新
+ */
+export const updateInspectionStatus = (params) => {
+  return defHttp.post<any>({
+    url: `/inspectionPlan/save`,
+    params,
+  });
+};

@@ -12,3 +12,14 @@ export const getInspectionRecordList = (params) => {
     params: otherParams,
   });
 };
+
+
+/**
+ * 删除
+ */
+export const deleteInsRecord = (params) => {
+  return defHttp.get<any>({
+    url: `/inspectionRecord/delete`,
+    params,
+  });
+};

@@ -12,3 +12,23 @@ export const getServicePlanList = (params) => {
     params: otherParams,
   });
 };
+
+/**
+ * 删除
+ */
+export const deleteServePlan = (params) => {
+  return defHttp.get<any>({
+    url: `/preservePlan/delete`,
+    params,
+  });
+};
+
+/**
+ * 更新
+ */
+export const updateServiceStatus = (params) => {
+  return defHttp.post<any>({
+    url: `/preservePlan/updateStatus`,
+    params,
+  });
+};

@@ -12,3 +12,13 @@ export const getServiceRecordList = (params) => {
     params: otherParams,
   });
 };
+
+/**
+ * 删除
+ */
+export const deleteServeRecord = (params) => {
+  return defHttp.get<any>({
+    url: `/preserveRecord/delete`,
+    params,
+  });
+};

@@ -12,3 +12,24 @@ export const getRepairOrderList = (params) => {
     params: otherParams,
   });
 };
+
+/**
+ * 新增
+ */
+export const saveOrder = (params) => {
+  return defHttp.post<any>({
+    url: `/repairOrder/save`,
+    params,
+  });
+};
+
+/**
+ * 删除
+ */
+export const deleteRepairOrder = (params) => {
+  return defHttp.get<any>({
+    url: `/repairOrder/delete`,
+    params,
+  });
+};
+

@@ -34,6 +34,7 @@ import { JEasyCron } from './components/JEasyCron';
 import ColorPicker from './components/ColorPicker.vue';
 import IconDrawer from './components/IconDrawer.vue';
 import ApiUpload from './components/ApiUpload.vue';
+// @ts-ignore
 import ApiSearchSelect from './components/ApiSearchSelect.vue';
 import CustomMinMaxInput from './components/CustomMinMaxInput.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';

@@ -45,6 +45,14 @@ export default {
   redo: '刷新',
   back: '返回',
 
+  start: '开始',
+  startConfirmText: '确认开始当前维护计划吗?',
+  stop: '停用',
+  stopConfirmText: '确认停用当前维护计划吗？',
+  down: '完成',
+  downConfirmText: '确认完成当前维护计划吗？',
+
+
   light: '亮色主题',
   dark: '黑暗主题',
 

 export default {
   listText: '巡检记录',
   nameText: '巡检计划',
+  createRecordText: '创建巡检记录',
   recordCodeText: '巡检编号',
   inspectionPlanText: '巡检计划',
   checkDateText: '巡检日期',

@@ -5,7 +5,8 @@ export default {
   statusText: '状态',
   frequencyText: '频率',
   timesText: '次数',
-  createCategoryText: '创建计划',
+  createPlanText: '创建计划',
+  editPlanText: '创建计划',
   NOTSTART : '未开始',
   UNDERWAY: '进行中',
   COMPLETED: '已完成',

 export default {
   listText: '保养记录',
+  planText: '保计计划',
   preserveNameText: '维护结果',
   preserveCodeText: '计划编号',
   statusText: '状态',
   time: '保养日期',
+  startTime: '开始时间',
+  endTime: '结束时间',
   frequencyText: '频率',
   timesText: '次数',
   createCategoryText: '创建记录',

@@ -19,7 +19,7 @@ export default {
   emergencyText: '是否紧急',
   enableText: '启用',
   disabledText: '停用',
-  createCategoryText: '创建工单',
-  editCategoryText: '编辑方案',
+  createOrderText: '创建工单',
+  editOrderText: '编辑工单',
   detailText: '查看详情',
 };

-import { formatToDateTime } from '/@/utils/dateUtil';
-import { FormSchema, useComponentRegister } from '/@/components/Form';
-import { BasicColumn } from '/@/components/Table';
-import { getCustomerList } from '/@/api/device/deviceManager';
-import { DescItem } from '/@/components/Description/index';
-import moment from 'moment';
-import { CSSProperties, h } from 'vue';
-import { Button, Tag, Tooltip } from 'ant-design-vue';
-import { TypeEnum, updateOrgHelpMessage } from './data';
-import { PageEnum } from '/@/enums/pageEnum';
-import { useGo } from '/@/hooks/web/usePage';
-import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { isNullOrUnDef } from '/@/utils/is';
-import { useI18n } from '/@/hooks/web/useI18n';
-import { DeviceStatusEnum } from '/@/enums/deviceEnum';
-import { AlarmStatus } from '/@/enums/alarmEnum';
-const { t } = useI18n();
-import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
-
-useComponentRegister('OrgTreeSelect', OrgTreeSelect);
-
-// 设备详情的描述
-export const descSchema = (emit: EmitType): DescItem[] => {
-  return [
-    {
-      field: 'createTime',
-      label: t('common.createTimeText'),
-    },
-    {
-      field: 'name',
-      label: t('business.deviceNameText'),
-      render(val, data: Record<'alias' | 'name', string>) {
-        return h(Tooltip, { title: data.alias || val }, () =>
-          h('span', { style: { cursor: 'pointer' } as CSSProperties }, data.alias || val)
-        );
-      },
-    },
-    {
-      field: 'label',
-      label: t('deviceManagement.device.deviceLabelText'),
-      render(val) {
-        return h(Tooltip, { title: val }, () =>
-          h('span', { style: { cursor: 'pointer' } as CSSProperties }, val)
-        );
-      },
-    },
-    {
-      field: 'deviceProfile.name',
-      label: t('business.productText'),
-      render(val) {
-        const go = useGo();
-        const { isCustomer } = useAuthDeviceDetail();
-        return h(
-          Button,
-          {
-            type: 'link',
-            style: { padding: 0 },
-            onClick: () =>
-              !isCustomer
-                ? go(PageEnum.DEVICE_PROFILE + '?name=' + encodeURIComponent(String(val)))
-                : '',
-          },
-          { default: () => val }
-        );
-      },
-    },
-    {
-      field: 'gatewayName',
-      label: t('business.affiliatedGatewayText'),
-      show: (data) => !!data.gatewayName,
-      render(val, data) {
-        if (TypeEnum.SENSOR !== data.deviceType) return val;
-        return h(
-          Button,
-          { type: 'link', style: { padding: 0 }, onClick: () => emit('open-gateway-device', data) },
-          { default: () => data.gatewayAlias || val }
-        );
-      },
-    },
-    {
-      field: 'deviceType',
-      label: t('business.deviceTypeText'),
-      render: (text) => {
-        return text && t(`enum.deviceType.${text}`);
-      },
-    },
-    {
-      field: 'deviceInfo.sip.cameraCode',
-      label: t('deviceManagement.device.deviceCameraCodeText'),
-    },
-    {
-      field: 'deviceInfo.sip.hostAddress',
-      label: t('deviceManagement.device.hostAddressText'),
-    },
-    {
-      field: 'deviceInfo.sip.manufacturer',
-      label: t('deviceManagement.device.brandText'),
-    },
-    {
-      field: 'deviceInfo.sip.streamMode',
-      label: t('deviceManagement.device.streamModeText'),
-    },
-    {
-      field: 'description',
-      label: t('common.descText'),
-      // span: 2,
-      render(val) {
-        return h(Tooltip, { title: val }, () =>
-          h('span', { style: { cursor: 'pointer' } as CSSProperties }, val)
-        );
-      },
-    },
-  ];
-};
-
-// 实时数据表格
-export const realTimeDataColumns: BasicColumn[] = [
-  {
-    title: t('deviceManagement.device.keyText'),
-    dataIndex: 'name',
-    width: 100,
-  },
-  {
-    title: t('deviceManagement.device.valueText'),
-    dataIndex: 'rawValue',
-    width: 160,
-    format(text) {
-      return isNullOrUnDef(text) ? '--' : text;
-    },
-  },
-  {
-    title: t('deviceManagement.device.latestUpdateTimeText'),
-    dataIndex: 'time',
-    width: 120,
-    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
-  },
-];
-
-// 告警
-export const alarmSearchSchemas: FormSchema[] = [
-  {
-    field: 'status',
-    label: t('business.deviceStatusText'),
-    component: 'Select',
-    colProps: { span: 6 },
-    componentProps: {
-      options: Object.values(AlarmStatus).map((value) => ({
-        label: t(`enum.alarmStaus.${value}`),
-        value,
-      })),
-    },
-  },
-  {
-    field: 'alarmType',
-    label: t('deviceManagement.device.alarmSceneText'),
-    component: 'Input',
-    colProps: { span: 6 },
-    componentProps: {
-      maxLength: 36,
-    },
-  },
-  {
-    field: 'alarmTime',
-    label: t('deviceManagement.device.alarmTimeText'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] },
-    },
-    colProps: { span: 7 },
-  },
-  {
-    field: 'severity',
-    label: t('deviceManagement.device.alarmSeverityText'),
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: {
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'severity_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-  },
-];
-export const alarmColumns: BasicColumn[] = [
-  {
-    title: t('deviceManagement.device.alarmTimeText'),
-    dataIndex: 'createdTime',
-    width: 180,
-  },
-  {
-    title: t('deviceManagement.device.alarmDeviceText'),
-    dataIndex: 'deviceName',
-    width: 120,
-    customRender: ({ record }) => {
-      const { deviceAlias, deviceName } = record || {};
-      return deviceAlias || deviceName;
-    },
-  },
-  {
-    title: t('deviceManagement.device.alarmSceneText'),
-    dataIndex: 'type',
-    width: 160,
-  },
-  {
-    title: t('deviceManagement.device.alarmSeverityText'),
-    dataIndex: 'severity',
-    width: 90,
-    format: (text) => alarmLevel(text),
-  },
-  {
-    title: t('deviceManagement.device.alarmDetailsText'),
-    dataIndex: 'details',
-    slots: { customRender: 'details' },
-    width: 160,
-  },
-  {
-    title: t('deviceManagement.device.statusText'),
-    dataIndex: 'status',
-    // format: (text) => statusType(text),
-    width: 100,
-  },
-];
-
-export const alarmSchemasForm: FormSchema[] = [
-  {
-    field: 'deviceName',
-    label: '告警设备',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-
-  {
-    field: 'startTs',
-    label: '开始时间',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'endTs',
-    label: '结束时间',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'ackTs',
-    label: '处理时间',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-    ifShow: ({ values }) => values.status === '激活已确认' || values.status === '清除已确认',
-  },
-  {
-    field: 'clearTs',
-    label: '清除时间',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-    ifShow: ({ values }) => values.status === '清除已确认' || values.status === '清除未确认',
-  },
-  {
-    field: 'type',
-    label: '告警场景',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'severity',
-    label: '严重程度',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-  {
-    field: 'status',
-    label: '状态',
-    component: 'Input',
-    componentProps: {
-      disabled: true,
-    },
-  },
-];
-// 子设备
-export const childDeviceSchemas: FormSchema[] = [
-  {
-    field: 'deviceState',
-    label: t('business.deviceStatusText'),
-    colProps: { span: 6 },
-    component: 'Select',
-    componentProps: {
-      maxLength: 255,
-      options: Object.values(DeviceStatusEnum).map((value) => ({
-        label: t(`enum.deviceStatus.${value}`),
-        value,
-      })),
-    },
-  },
-  {
-    field: 'name',
-    label: t('business.deviceNameText'),
-    component: 'Input',
-    colProps: { span: 6 },
-    componentProps: {
-      maxLength: 255,
-    },
-  },
-];
-
-const deviceStatusColorMapping = {
-  [DeviceStatusEnum.INACTIVE]: 'warning',
-  [DeviceStatusEnum.OFFLINE]: 'error',
-  [DeviceStatusEnum.ONLINE]: 'success',
-};
-export const childDeviceColumns: BasicColumn[] = [
-  {
-    title: t('deviceManagement.device.nameText'),
-    dataIndex: 'tbDeviceName',
-    width: 120,
-    slots: {
-      customRender: 'tbDeviceName',
-    },
-  },
-  {
-    title: t('deviceManagement.device.labelText'),
-    dataIndex: 'label',
-    width: 160,
-  },
-  {
-    title: t('deviceManagement.device.statusText'),
-    dataIndex: 'deviceState',
-    customRender: ({ text }) => {
-      return h(Tag, { color: deviceStatusColorMapping[text] }, () =>
-        t(`enum.deviceStatus.${text}`)
-      );
-    },
-    width: 160,
-  },
-  {
-    title: t('deviceManagement.device.latestConnectionTimeText'),
-    dataIndex: 'lastOnlineTime',
-    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
-    width: 160,
-  },
-  {
-    title: t('common.updateTimeText'),
-    dataIndex: 'createdTime',
-    format: (text) => formatToDateTime(text, 'YYYY-MM-DD HH:mm:ss'),
-    width: 160,
-  },
-];
-
-export const alarmLevel = (type: string): string => {
-  const { t } = useI18n();
-
-  return t(`enum.alarmLevel.${type}`);
-};
-
-export const customerForm: FormSchema[] = [
-  {
-    field: 'customerId',
-    label: t('deviceManagement.device.assignCustomerText'),
-    component: 'ApiSelect',
-    componentProps: {
-      api: getCustomerList,
-      immediate: false,
-      labelField: 'realName',
-      valueField: 'customerId',
-    },
-    required: true,
-    colProps: { span: 12 },
-  },
-];
-
-export const orgForm: FormSchema[] = [
-  {
-    field: 'sensorOrganizationId',
-    label: t('deviceManagement.device.organizeArrayBased'),
-    component: 'Input',
-    ifShow: false,
-  },
-  {
-    field: 'organizationId',
-    component: 'OrgTreeSelect',
-    helpMessage: updateOrgHelpMessage,
-    label: t('deviceManagement.device.chooseOrganization'),
-    required: true,
-    componentProps: ({ formModel }) => {
-      return {
-        apiTreeSelectProps: {
-          params: {
-            organizationId: formModel?.sensorOrganizationId,
-          },
-        },
-      };
-    },
-  },
-];

 import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
-import moment from "moment/moment";
 const { t } = useI18n();
 
 const typeOptions = [
@@ -30,23 +29,13 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'startTime',
     label: t('inspection.inspectionPlan.startTimeText'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
+    component: 'DatePicker',
     colProps: { span: 6 },
   },
   {
     field: 'endTime',
     label: t('inspection.inspectionPlan.endTimeText'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
+    component: 'DatePicker',
     colProps: { span: 6 },
   },
 ];

@@ -22,16 +22,72 @@
           {{ t(`inspection.inspectionPlan.${record.status}`) }}
         </Tag>
       </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: t('common.editText'),
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              // onClick: handleEdit.bind(null, record),
+              ifShow: () => record.status === 'NOT_START',
+            },
+            {
+              label: t('common.delText'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              ifShow: () => record.status === 'NOT_START',
+              popConfirm: {
+                title: t('common.deleteConfirmText'),
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+            {
+              label: t('common.start'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:caret-right-outlined',
+              ifShow: () => record.status === 'NOT_START',
+              popConfirm: {
+                title: t('common.startConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record),
+              },
+            },
+            {
+              label: t('common.stop'),
+              auth: 'api:yt:product:category:delete',
+              icon: ' <PauseCircleOutlined />',
+              ifShow: () => record.status === 'NOT_START' || record.status === 'UNDERWAY',
+              popConfirm: {
+                title: t('common.stopConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record,'STOP'),
+              },
+            },
+            {
+              label: t('common.down'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:check-circle-outlined',
+              ifShow: () => record.status === 'UNDERWAY',
+              popConfirm: {
+                title: t('common.downConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
     </BasicTable>
   </div>
 </template>
 <script setup lang="ts">
-import { BasicTable, useTable } from '/@/components/Table';
-import { getInspectionPlanList } from '/@/api/inspection/inspectionPlan';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import {deleteInspectionPlan, getInspectionPlanList, updateInspectionStatus} from '/@/api/inspection/inspectionPlan';
 import { columns, searchFormSchema } from './index';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { Button, Tag } from 'ant-design-vue';
+import {useMessage} from "/@/hooks/web/useMessage";
 const { t } = useI18n();
+const { createMessage } = useMessage();
 
 const [
   registerTable,
@@ -62,4 +118,48 @@ const [
     getCheckboxProps: (record: any) => {},
   },
 });
+
+const handleDelete = async (record?: any) => {
+  let id = record.id;
+  try {
+    setLoading(true);
+    await deleteInspectionPlan({ id });
+    createMessage.success(t('common.deleteSuccessText'));
+    handleReload();
+  } catch (error) {
+    throw error;
+  } finally {
+    setLoading(false);
+  }
+};
+
+const handleReload = () => {
+  setSelectedRowKeys([]);
+  reload();
+};
+
+const handleUpdateStatus = async (record?: any,value?: string) => {
+  let _status = '';
+  if (record.status === 'NOT_START') {
+    _status = 'UNDERWAY'
+  }else if(record.status === 'UNDERWAY'){
+    _status = 'FINISH'
+  }else if(record.status === 'FINISH'){
+    _status = 'STOP'
+  }
+  if (value === 'STOP') {
+    _status = 'STOP'
+  }
+  try {
+    setLoading(true);
+    await updateInspectionStatus({ ...record,status: _status });
+    createMessage.success(t('common.editSuccessText'));
+    handleReload();
+  } catch (error) {
+    throw error;
+  } finally {
+    setLoading(false);
+  }
+}
+
 </script>

 import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
-import moment from "moment";
+import {getInspectionPlanList} from "../../../api/inspection/inspectionPlan";
 const { t } = useI18n();
 
 
 const resultOptions = [
-  { label: t('inspection.inspectionRecord.normal'), value: 'true' },
-  { label: t('inspection.inspectionRecord.error'), value: 'false' },
+  { label: t('inspection.inspectionRecord.normal'), value: true },
+  { label: t('inspection.inspectionRecord.error'), value: false },
 ];
 
 export const searchFormSchema: FormSchema[] = [
@@ -16,40 +16,34 @@ export const searchFormSchema: FormSchema[] = [
     label: t('inspection.inspectionRecord.nameText'),
     component: 'Input',
     colProps: { span: 6 },
-  },
-  {
-    field: 'inspectorId',
-    label: t('inspection.inspectionRecord.inspectorIdText'),
-    component: 'Input',
-    colProps: { span: 6 },
+    componentProps: {
+      api: getInspectionPlanList,
+      params: {
+        page: 1,
+        pageSize: 999,
+      },
+      resultField: 'items',
+      labelField: 'name',
+      valueField: 'id',
+    },
   },
   {
     field: 'startTime',
     label: t('inspection.inspectionRecord.startTimeText'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
+    component: 'DatePicker',
     colProps: { span: 6 },
   },
   {
     field: 'endTime',
     label: t('inspection.inspectionRecord.endTimeText'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
+    component: 'DatePicker',
     colProps: { span: 6 },
   },
   {
     field: 'recordResult',
     label: t('inspection.inspectionRecord.recordResultText'),
     component: 'Select',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
     componentProps: {
       options: resultOptions,
     },
@@ -63,12 +57,17 @@ export const columns: BasicColumn[] = [
   },
   {
     title: t('inspection.inspectionRecord.inspectionPlanText'),
-    dataIndex: 'inspectionPlanId',
+    dataIndex: 'tkInspectionPlanDTO',
+    format: (text, record) => {
+      return record.tkInspectionPlanDTO?.name || '-'|| text;
+    },
   },
   {
     title: t('inspection.inspectionRecord.inspectorByName'),
-    dataIndex: 'inspectorId',
-
+    dataIndex: 'userDTO',
+    format: (text, record) => {
+      return record.userDTO?.realName || '-' || text;
+    },
   },
   {
     title: t('inspection.inspectionRecord.checkDateText'),
@@ -78,6 +77,5 @@ export const columns: BasicColumn[] = [
     title: t('inspection.inspectionRecord.recordResultText'),
     dataIndex: 'recordResult',
     slots: { customRender: 'recordResult' },
-
   },
 ];

@@ -4,28 +4,52 @@
       <template #toolbar>
         <Authority value="api:yt:product:category:post">
           <Button type="primary" >
-            {{ t('inspection.inspectionRecord.createCategoryText') }}
+            {{ t('inspection.inspectionRecord.createRecordText') }}
           </Button>
         </Authority>
       </template>
       <template #recordResult="{ record }">
         <Tag
-          :color="record.status ? 'green' : 'red'"
+          :color="record.recordResult ? 'green' : 'red'"
           class="ml-2"
         >
           {{record.recordResult ? '正常' : '异常'}}
         </Tag>
       </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: t('common.editText'),
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              // onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: t('common.delText'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: t('common.deleteConfirmText'),
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
     </BasicTable>
   </div>
 </template>
 <script setup lang="ts">
-  import { BasicTable, useTable } from '/@/components/Table';
-  import { getInspectionRecordList } from '/@/api/inspection/inspectionRecord';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { getInspectionRecordList, deleteInsRecord } from '/@/api/inspection/inspectionRecord';
   import { columns, searchFormSchema } from './index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Button, Tag } from 'ant-design-vue';
+  import {useMessage} from "/@/hooks/web/useMessage";
   const { t } = useI18n();
+  const { createMessage } = useMessage();
 
   const [
     registerTable,
@@ -56,4 +80,23 @@
       getCheckboxProps: (record: any) => {},
     },
   });
+
+  const handleDelete = async (record?: any) => {
+    let id = record.id;
+    try {
+      setLoading(true);
+      await deleteInsRecord({ id });
+      createMessage.success(t('common.deleteSuccessText'));
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleReload = () => {
+    setSelectedRowKeys([]);
+    reload();
+  };
 </script>

+import servicePlanModal from './servicePlanModal.vue';
+
+export { servicePlanModal };

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="30rem"
+      :title="getTitle"
+      @register="register"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      destroyOnClose
+    >
+      <div>
+        <BasicForm @register="registerForm" />
+      </div>
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+import {computed, ref, unref} from "vue";
+import {useI18n} from "/@/hooks/web/useI18n";
+import {useForm} from "/@/components/Form";
+import {schemas} from "../index";
+import {useModalInner} from "/@/components/Modal";
+const { t } = useI18n();
+const isUpdate = ref<Boolean>(false);
+const recordInfo = ref<any>({});
+const emit = defineEmits(['handleReload', 'register']);
+
+const getTitle = computed(() =>
+  !unref(isUpdate)
+    ? t('inspection.servicePlan.createPlanText')
+    : t('inspection.servicePlan.editPlanText')
+);
+
+const [registerForm, { getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({
+  labelWidth: 140,
+  schemas,
+  actionColOptions: {
+    span: 14,
+  },
+  showActionButtonGroup: false,
+});
+
+const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
+  setModalProps({ confirmLoading: false, loading: true });
+  isUpdate.value = data?.isUpdate;
+  recordInfo.value = data?.record;
+  if (data?.record) {
+    setFieldsValue(data?.record);
+  }
+  setModalProps({ loading: false });
+});
+
+const handleCancel = () => {
+  closeModal();
+};
+
+const handleOk = async () => {
+
+}
+</script>

@@ -35,3 +35,51 @@ export const columns: BasicColumn[] = [
     dataIndex: 'times',
   },
 ];
+
+
+export const schemas: FormSchema[] = [
+  {
+    field: 'code',
+    label: t('equipment.checkPlan.nameCode'),
+    component: 'Input',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      maxLength: 20,
+    },
+  },
+  {
+    field: 'name',
+    label: t('equipment.checkPlan.nameText'),
+    component: 'Input',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      maxLength: 20,
+    },
+  },
+  {
+    field: 'type',
+    label: t('equipment.checkPlan.typeText'),
+    component: 'RadioButtonGroup',
+    defaultValue: 'INSPECTION',
+
+  },
+  {
+    field: 'status',
+    label: t('equipment.checkPlan.statusText'),
+    component: 'RadioButtonGroup',
+    defaultValue: 'ENABLE',
+
+  },
+  {
+    field: 'planDetails',
+    label: t('equipment.checkPlan.nameDetail'),
+    component: 'InputTextArea',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      maxLength: 200,
+    },
+  },
+];

@@ -4,7 +4,7 @@
       <template #toolbar>
         <Authority value="api:yt:product:category:post">
           <Button type="primary" @click="handleCreate">
-            {{ t('inspection.servicePlan.createCategoryText') }}
+            {{ t('inspection.servicePlan.createPlanText') }}
           </Button>
         </Authority>
       </template>
@@ -22,16 +22,76 @@
           {{ t(`inspection.servicePlan.${record.status}`) }}
         </Tag>
       </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: t('common.editText'),
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              // onClick: handleEdit.bind(null, record),
+              ifShow: () => record.status === 'NOTSTART',
+            },
+            {
+              label: t('common.delText'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              ifShow: () => record.status === 'NOTSTART',
+              popConfirm: {
+                title: t('common.deleteConfirmText'),
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+            {
+              label: t('common.start'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:caret-right-outlined',
+              ifShow: () => record.status === 'NOTSTART',
+              popConfirm: {
+                title: t('common.startConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record),
+              },
+            },
+            {
+              label: t('common.stop'),
+              auth: 'api:yt:product:category:delete',
+              icon: ' <PauseCircleOutlined />',
+              ifShow: () => record.status === 'NOTSTART' || record.status === 'UNDERWAY',
+              popConfirm: {
+                title: t('common.stopConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record,'STOP'),
+              },
+            },
+            {
+              label: t('common.down'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:check-circle-outlined',
+              ifShow: () => record.status === 'UNDERWAY',
+              popConfirm: {
+                title: t('common.downConfirmText'),
+                confirm: handleUpdateStatus.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
     </BasicTable>
+    <servicePlanModal @register="registerModal" @handleReload="handleReload" />
+
   </div>
 </template>
 <script setup lang="ts">
-  import { BasicTable, useTable } from '/@/components/Table';
-  import { getServicePlanList } from '/@/api/inspection/servicePlan';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import {deleteServePlan, getServicePlanList, updateServiceStatus} from '/@/api/inspection/servicePlan';
   import { columns, searchFormSchema } from './index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Button, Tag } from 'ant-design-vue';
+  import {useModal} from "/@/components/Modal";
+  import {useMessage} from "/@/hooks/web/useMessage";
   const { t } = useI18n();
+  const [registerModal, { openModal }] = useModal();
+  const { createMessage } = useMessage();
 
   const [
     registerTable,
@@ -62,4 +122,56 @@
       getCheckboxProps: (record: any) => {},
     },
   });
+
+  // 新增
+  const handleCreate = () => {
+    openModal(true, {
+      isUpdate: false,
+    });
+  };
+
+  const handleReload = () => {
+    setSelectedRowKeys([]);
+    reload();
+  };
+
+  const handleDelete = async (record?: any) => {
+    let id = record.id;
+    try {
+      setLoading(true);
+      await deleteServePlan({ id });
+      createMessage.success(t('common.deleteSuccessText'));
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleUpdateStatus = async (record?: any,value?: string) => {
+    let id = record.id;
+    let status = '';
+    if (record.status === 'NOTSTART') {
+      status = 'UNDERWAY'
+    }else if(record.status === 'UNDERWAY'){
+      status = 'COMPLETED'
+    }else if(record.status === 'COMPLETED'){
+      status = 'STOP'
+    }
+    if (value === 'STOP') {
+      status = 'STOP'
+    }
+    try {
+      setLoading(true);
+      await updateServiceStatus({ id,status });
+      createMessage.success(t('common.editSuccessText'));
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  }
+
 </script>

 import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
-import moment from "moment";
+import {getServicePlanList} from "../../../api/inspection/servicePlan";
 const { t } = useI18n();
 
 
@@ -12,23 +12,40 @@ const statusOptions = [
 
 export const searchFormSchema: FormSchema[] = [
   {
+    field: 'preservePlanId',
+    label: t('inspection.serviceRecord.planText'),
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: {
+      api: getServicePlanList,
+      params: {
+        page: 1,
+        pageSize: 999,
+      },
+      resultField: 'items',
+      labelField: 'preserveName',
+      valueField: 'id',
+    },
+  },
+  {
     field: 'preserveStatus',
     label: t('inspection.serviceRecord.preserveNameText'),
     component: 'Select',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
     componentProps: {
       options: statusOptions,
     },
   },
   {
     field: 'startDate',
-    label: t('inspection.serviceRecord.time'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
+    label: t('inspection.serviceRecord.startTime'),
+    component: 'DatePicker',
+    colProps: { span: 6 },
+  },
+  {
+    field: 'endDate',
+    label: t('inspection.serviceRecord.endTime'),
+    component: 'DatePicker',
     colProps: { span: 6 },
   },
 ];

@@ -20,16 +20,40 @@
           {{ t(`inspection.serviceRecord.${record.preserveStatus}`) }}
         </Tag>
       </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            {
+              label: t('common.editText'),
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              // onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: t('common.delText'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: t('common.deleteConfirmText'),
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
     </BasicTable>
   </div>
 </template>
 <script setup lang="ts">
-import { BasicTable, useTable } from '/@/components/Table';
-import { getServiceRecordList } from '/@/api/inspection/serviceRecord';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { getServiceRecordList, deleteServeRecord } from '/@/api/inspection/serviceRecord';
 import { columns, searchFormSchema } from './index';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { Button, Tag } from 'ant-design-vue';
+import {useMessage} from "/@/hooks/web/useMessage";
 const { t } = useI18n();
+const { createMessage } = useMessage();
 
 const [
   registerTable,
@@ -60,4 +84,24 @@ const [
     getCheckboxProps: (record: any) => {},
   },
 });
+
+const handleDelete = async (record?: any) => {
+  let id = record.id;
+  try {
+    setLoading(true);
+    await deleteServeRecord({ id });
+    createMessage.success(t('common.deleteSuccessText'));
+    handleReload();
+  } catch (error) {
+    throw error;
+  } finally {
+    setLoading(false);
+  }
+};
+
+const handleReload = () => {
+  setSelectedRowKeys([]);
+  reload();
+};
+
 </script>

 import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
+import {getRepairOrderList} from "../../../api/repair/order";
 const { t } = useI18n();
 
 export const columns: BasicColumn[] = [
   {
     title: t('repair.history.orderCode'),
-    dataIndex: 'tkRepairOrderDTO',
-    // format: (text,record) => {
-    //   return record.orderCode;
-    // },
+    dataIndex: 'code',
   },
   {
     title: t('repair.history.orderText'),
     dataIndex: 'tkRepairOrderDTO',
-    // format: (text,record) => {
-    //   return record.orderCode;
-    // },
+    format: (text, record) => {
+      return record.tkRepairOrderDTO?.orderCode || '-' || text;
+    },
   },
   {
     title: t('repair.history.deviceNameText'),
-    dataIndex: 'reportDate',
+    dataIndex: 'deviceAccountName',
   },
   {
     title: t('repair.history.time'),
-    dataIndex: 'time',
+    dataIndex: 'tkRepairOrderDTO',
+    format: (text, record) => {
+      return record.tkRepairOrderDTO?.reportDate || '-' || text;
+    },
   },
   {
     title: t('repair.history.reportByName'),
-    dataIndex: 'reportByName',
+    dataIndex: 'tkRepairOrderDTO',
+    format: (text, record) => {
+      return record.tkRepairOrderDTO?.reportByName || '-' || text;
+    },
   },
   {
     title: t('repair.history.photo'),
-    dataIndex: 'photo',
+    dataIndex: 'tkRepairOrderDTO',
+    format: (text, record) => {
+      return record.tkRepairOrderDTO?.situationImg || '-' || text;
+    },
   },
   {
     title: t('repair.history.description'),
@@ -40,23 +47,15 @@ export const columns: BasicColumn[] = [
   },
   {
     title: t('repair.history.repairTime'),
-    dataIndex: 'repairTime',
-    slots: { customRender: 'repairTime' },
+    dataIndex: 'repairDate',
   },
   {
     title: t('repair.history.repairByName'),
-    dataIndex: 'repairByName',
-    slots: { customRender: 'repairByName' },
+    dataIndex: 'repairName',
   },
   {
     title: t('repair.history.repairReason'),
-    dataIndex: 'repairReason',
-    slots: { customRender: 'repairReason' },
-  },
-  {
-    title: t('repair.history.repairDescription'),
-    dataIndex: 'repairDescription',
-    slots: { customRender: 'repairDescription' },
+    dataIndex: 'malfunctionReasonName',
   },
 ];
 
@@ -64,7 +63,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'orderId',
     label: t('repair.history.orderText'),
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    componentProps: {
+      api: getRepairOrderList,
+      params: {
+        page: 1,
+        pageSize: 999,
+      },
+      resultField: 'items',
+      labelField: 'orderCode',
+      valueField: 'id',
+    },
   },
 ];

+import { FormSchema } from '/@/components/Form';
+import { useI18n } from '/@/hooks/web/useI18n';
+import {uploadThumbnail} from "/@/api/configuration/center/configurationCenter";
+import {createImgPreview} from "/@/components/Preview";
+
+const { t } = useI18n();
+const statusOptions = [
+  { label: t('repair.order.SCHEDULING'), value: 'SCHEDULING' },
+  { label: t('repair.order.REPAIRFINISH'), value: 'REPAIRFINISH' },
+  { label: t('repair.order.ACCEPTANCEPASSED'), value: 'ACCEPTANCEPASSED' },
+];
+const emergencyOptions = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
+export const formSchema: FormSchema[] = [
+  {
+    field: 'situationImg',
+    label: t('deviceManagement.product.imageText'),
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        disabled: 'disabled',
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            };
+          } catch (error) {
+            return {};
+          }
+        },
+        onPreview: (fileList) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
+      };
+    },
+  },
+  {
+    field: 'orderCode',
+    label: t('repair.order.nameCode'),
+    component: 'Input',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      disabled: 'disabled',
+      maxLength: 20,
+    },
+  },
+  {
+    field: 'deviceId',
+    label: t('repair.order.deviceNameText'),
+    component: 'Input',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      disabled: 'disabled',
+      maxLength: 20,
+    },
+  },
+  {
+    field: 'reportBy',
+    component: 'Input',
+    label: '报修人',
+    required: true,
+    colProps: { span: 21 },
+    componentProps: {
+      disabled: 'disabled',
+      // 动态加载的选项
+      options: [], // 初始为空，后续动态加载
+    },
+  },
+  {
+    field: 'reportDate',
+    label: t('repair.order.time'),
+    component: 'DatePicker',
+    componentProps: {
+      disabled: 'disabled',
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
+    },
+  },
+  {
+    field: 'status',
+    label: t('repair.order.statusText'),
+    component: 'RadioButtonGroup',
+    defaultValue: 'ENABLE',
+    componentProps: {
+      disabled: 'disabled',
+      options: statusOptions,
+    },
+  },
+  {
+    field: 'emergency',
+    label: t('repair.order.emergencyText'),
+    component: 'Select',
+    colProps: { span: 21 },
+    required: true,
+    componentProps: {
+      disabled: 'disabled',
+      options: emergencyOptions,
+    },
+  },
+  {
+    field: 'description',
+    label: '故障描述',
+    colProps: { span: 21 },
+    component: 'InputTextArea',
+    componentProps: {
+      disabled: 'disabled',
+      maxLength: 255,
+      placeholder: '请输入描述',
+    },
+  },
+
+];

+export { default as FormDrawer } from './index.vue';

+<script lang="ts" setup>
+  import { nextTick, ref, unref, computed } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { formSchema } from './config';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { JSONEditor } from '/@/components/CodeEditor';
+  import { ApplicationApiItemType } from '/@/api/application/model/api';
+
+  const emits = defineEmits(['success', 'register']);
+
+  const { t } = useI18n();
+
+  const { createMessage } = useMessage();
+
+  const handleCount = ref<Number>(); // 0 新增 1 编辑 2 详情
+
+  const recordData = ref<ApplicationApiItemType>();
+
+  const [registerForm, { resetFields, validate, setFieldsValue, setProps }] = useForm({
+    labelWidth: 120,
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
+
+  const cacheTitle = computed(() =>
+    unref(handleCount) === 0
+      ? t('application.api.action.create')
+      : unref(handleCount) === 1
+      ? t('application.api.action.edit')
+      : t('application.api.action.detail')
+  );
+
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    setDrawerProps({ loading: true });
+    await resetFields();
+    handleCount.value = data.isUpdate;
+    recordData.value = data.record;
+    if (unref(handleCount) === 2) {
+      setProps({ disabled: true });
+    } else {
+      setProps({ disabled: false });
+    }
+    try {
+      await nextTick();
+      setFieldsValue(data.record);
+    } finally {
+      setDrawerProps({ loading: false });
+    }
+  });
+
+
+</script>
+
+<template>
+  <div>
+    <BasicDrawer
+      destroyOnClose
+      v-bind="$attrs"
+      :showFooter="handleCount !== 2"
+      :title="cacheTitle"
+      width="30%"
+      :maskClosable="true"
+      @register="registerDrawer"
+    >
+      <BasicForm @register="registerForm">
+        <template #interfaceParamsSlot="{ model, field }">
+          <JSONEditor v-model:value="model[field]" />
+        </template>
+      </BasicForm>
+    </BasicDrawer>
+  </div>
+</template>
+
+<style lang="less" scoped></style>

+import orderModal from './orderModal.vue';
+
+export { orderModal };

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="30rem"
+      :title="getTitle"
+      @register="register"
+      @cancel="handleCancel"
+      @ok="handleOk"
+      destroyOnClose
+    >
+      <div>
+        <BasicForm @register="registerForm" />
+      </div>
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+import {BasicModal, useModalInner} from "/@/components/Modal";
+import {BasicForm, useForm} from "/@/components/Form";
+import {computed, ref, unref} from "vue";
+import {useI18n} from "/@/hooks/web/useI18n";
+import {schemas} from "../index";
+import {getUserListByOrg} from "/@/api/equipment/ledger";
+import {useUserStore} from "/@/store/modules/user";
+import {saveOrder} from "/@/api/repair/order";
+import {useMessage} from "/@/hooks/web/useMessage";
+const { t } = useI18n();
+const isUpdate = ref<Boolean>(false);
+const recordInfo = ref<any>({});
+// 定义人员选项
+const userOptions = ref<any[]>([]);
+const userInfo = useUserStore();
+const { createMessage } = useMessage();
+
+const emit = defineEmits(['handleReload', 'register']);
+
+const getTitle = computed(() =>
+  !unref(isUpdate)
+    ? t('repair.order.createOrderText')
+    : t('repair.order.editOrderText')
+);
+
+const [registerForm, { getFieldsValue, setFieldsValue, validate,updateSchema }] = useForm({
+  labelWidth: 140,
+  schemas,
+  actionColOptions: {
+    span: 14,
+  },
+  showActionButtonGroup: false,
+});
+
+const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
+  setModalProps({ confirmLoading: false, loading: true });
+  isUpdate.value = data?.isUpdate;
+  recordInfo.value = data?.record;
+  // 更新 formSchema 中的 org 字段，绑定 change 事件
+  updateSchema({
+    field: 'org',
+    componentProps: {
+      onChange: handleOrgChange,
+    },
+  });
+  if (data?.record) {
+    setFieldsValue(data?.record);
+  }
+  setModalProps({ loading: false });
+});
+
+// 监听 org 字段的变化
+const handleOrgChange = async (orgId: string) => {
+  if (!orgId) {
+    userOptions.value = []; // 清空人员选项
+    updateSchema({
+      field: 'reportBy',
+      componentProps: { options: [] },
+    });
+    return;
+  }
+  const _data = {
+    page: '1',
+    pageSize: '999',
+    tenantId: userInfo.getUserInfo.tenantId!,
+    organizationId: orgId
+  }
+  // 调用接口 B 获取人员数据
+  const userList = await getUserListByOrg(_data);
+  userOptions.value = userList?.items.map(user => ({
+    label: user.username,
+    value: user.id,
+  }));
+
+  // 更新 user 字段的选项
+  updateSchema({
+    field: 'reportBy',
+    componentProps: { options: userOptions.value },
+  });
+};
+
+
+const handleCancel = () => {
+  closeModal();
+};
+
+const handleOk = async () => {
+  await validate();
+  let values = getFieldsValue();
+  if (unref(isUpdate)) {
+    values = { ...values, id: unref(recordInfo).id,  situationImg: values.situationImg?.[0]?.url};
+  }else {
+    values = { ...values,  situationImg: values.situationImg?.[0]?.url};
+  }
+  await saveOrder(values);
+  createMessage.success(t('common.operationSuccessText'));
+  emit('handleReload');
+  handleCancel();
+};
+
+</script>

-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
-import moment from 'moment/moment';
+import {getLedgerList} from "/@/api/equipment/ledger";
 const { t } = useI18n();
+import { OrgTreeSelect } from '../../common/OrgTreeSelect';
+import {uploadThumbnail} from "/@/api/configuration/center/configurationCenter";
+import {createImgPreview} from "/@/components/Preview";
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 const statusOptions = [
   { label: t('repair.order.SCHEDULING'), value: 'SCHEDULING' },
   { label: t('repair.order.REPAIRFINISH'), value: 'REPAIRFINISH' },
   { label: t('repair.order.ACCEPTANCEPASSED'), value: 'ACCEPTANCEPASSED' },
 ];
-const typeOptions = [
-  { label: t('repair.order.inspectionText'), value: 'INSPECTION' },
-  { label: t('repair.order.maintenanceText'), value: 'MAINTENANCE' },
+const emergencyOptions = [
+  { label: '是', value: true },
+  { label: '否', value: false },
 ];
 
 export const columns: BasicColumn[] = [
@@ -52,8 +56,18 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'deviceId',
     label: t('repair.order.deviceNameText'),
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    componentProps: {
+      api: getLedgerList,
+      params: {
+        page: 1,
+        pageSize: 999,
+      },
+      resultField: 'items',
+      labelField: 'name',
+      valueField: 'id',
+    },
   },
   {
     field: 'status',
@@ -63,23 +77,46 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       options: statusOptions,
     },
-  },
-  {
-    field: 'startDate',
-    label: t('repair.order.time'),
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
-    colProps: { span: 6 },
-  },
+  }
 ];
 
 export const schemas: FormSchema[] = [
   {
-    field: 'code',
+    field: 'situationImg',
+    label: t('deviceManagement.product.imageText'),
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            };
+          } catch (error) {
+            return {};
+          }
+        },
+        onPreview: (fileList) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
+      };
+    },
+  },
+  {
+    field: 'orderCode',
     label: t('repair.order.nameCode'),
     component: 'Input',
     colProps: { span: 21 },
@@ -89,22 +126,54 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'name',
-    label: t('repair.order.nameText'),
-    component: 'Input',
+    field: 'deviceId',
+    label: t('repair.order.deviceNameText'),
+    component: 'ApiSelect',
     colProps: { span: 21 },
     required: true,
     componentProps: {
-      maxLength: 20,
+      api: getLedgerList,
+      params: {
+        page: 1,
+        pageSize: 999,
+      },
+      resultField: 'items',
+      labelField: 'name',
+      valueField: 'id',
     },
   },
   {
-    field: 'type',
-    label: t('repair.order.typeText'),
-    component: 'RadioButtonGroup',
-    defaultValue: 'INSPECTION',
+    field: 'org',
+    component: 'OrgTreeSelect',
+    label: '报修人组织',
+    required: true,
+    colProps: { span: 24 },
     componentProps: {
-      options: typeOptions,
+      // 添加 change 事件
+      onChange: (value: string) => {
+        // 这里需要触发加载人员数据的逻辑
+        console.log(value,'value')
+      },
+    },
+  },
+  {
+    field: 'reportBy',
+    component: 'Select',
+    label: '报修人',
+    required: true,
+    colProps: { span: 21 },
+    componentProps: {
+      // 动态加载的选项
+      options: [], // 初始为空，后续动态加载
+    },
+  },
+  {
+    field: 'reportDate',
+    label: t('repair.order.time'),
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      format: 'YYYY-MM-DD HH:mm:ss',
     },
   },
   {
@@ -117,13 +186,23 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'planDetails',
-    label: t('repair.order.nameDetail'),
-    component: 'InputTextArea',
+    field: 'emergency',
+    label: t('repair.order.emergencyText'),
+    component: 'Select',
     colProps: { span: 21 },
     required: true,
     componentProps: {
-      maxLength: 200,
+      options: emergencyOptions,
+    },
+  },
+  {
+    field: 'description',
+    label: '故障描述',
+    colProps: { span: 21 },
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入描述',
     },
   },
 ];

@@ -3,8 +3,8 @@
     <BasicTable style="flex: auto" @register="registerTable">
       <template #toolbar>
         <Authority value="api:yt:product:category:post">
-          <Button type="primary">
-            {{ t('repair.order.createCategoryText') }}
+          <Button type="primary" @click="handleCreate">
+            {{ t('repair.order.createOrderText') }}
           </Button>
         </Authority>
       </template>
@@ -30,10 +30,43 @@
           {{ record.emergency ? '是' : '否' }}
         </Tag>
       </template>
+      <template #action="{ record }">
+        <TableAction
+          :actions="[
+            // {
+            //   label: t('common.detailText'),
+            //   icon: 'ant-design:eye-outlined',
+            //   auth: 'api:yt:product:category:get',
+            //   onClick: handleDetail.bind(null, record),
+            // },
+            {
+              label: t('common.editText'),
+              auth: 'api:yt:product:category:update',
+              icon: 'clarity:note-edit-line',
+              onClick: handleEdit.bind(null, record),
+            },
+            {
+              label: t('common.delText'),
+              auth: 'api:yt:product:category:delete',
+              icon: 'ant-design:delete-outlined',
+              color: 'error',
+              popConfirm: {
+                title: t('common.deleteConfirmText'),
+                confirm: handleDelete.bind(null, record),
+              },
+            },
+          ]"
+        />
+      </template>
     </BasicTable>
+    <orderModal @register="registerModal" @handleReload="handleReload" />
+    <FormDrawer
+      @register="registerApplicationApiFormDrawer"
+    />
   </div>
 </template>
 <script setup lang="ts">
+  import { orderModal } from "./components/index"
   import { BasicTable, TableAction } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
   import { getRepairOrderList } from '/@/api/repair/order';
@@ -41,7 +74,15 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Button, Tag } from 'ant-design-vue';
   import { Authority } from '/@/components/Authority';
+  import {useModal} from "/@/components/Modal";
   const { t } = useI18n();
+  const [registerModal, { openModal }] = useModal();
+  import {FormDrawer} from "./components/FormDrawer/index";
+  import {useDrawer} from "/@/components/Drawer";
+  import {deleteRepairOrder} from "/@/api/repair/order";
+  import {useMessage} from "/@/hooks/web/useMessage";
+  const [registerApplicationApiFormDrawer, { openDrawer }] = useDrawer();
+  const { createMessage } = useMessage();
 
   const [
     registerTable,
@@ -72,4 +113,46 @@
       getCheckboxProps: (record: any) => {},
     },
   });
+
+  const handleReload = () => {
+    setSelectedRowKeys([]);
+    reload();
+  };
+
+  // 新增
+  const handleCreate = () => {
+    openModal(true, {
+      isUpdate: false,
+    });
+  };
+
+  const handleDetail = (record?: any) => {
+    openDrawer(true, {
+      isUpdate: 2,
+      record,
+    });
+  };
+
+  // 编辑
+  const handleEdit = (record?: any) => {
+    openModal(true, {
+      isUpdate: true,
+      record,
+    });
+  };
+
+  const handleDelete = async (record?: any) => {
+    let id = record.id;
+    try {
+      setLoading(true);
+      await deleteRepairOrder({ id });
+      createMessage.success(t('common.deleteSuccessText'));
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
+
 </script>