commit: 优化代码

@@ -30,7 +30,7 @@
   const emit = defineEmits(['handleReload', 'register']);
   const { createMessage } = useMessage();
 
-  const [registerForm, { getFieldsValue, setFieldsValue, validate, resetFields }] = useForm({
+  const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
     labelWidth: 150,
     schemas,
     actionColOptions: {

@@ -3,22 +3,16 @@
   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({
+  const [registerForm, { resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -32,7 +26,7 @@
       : t('application.api.action.detail')
   );
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
     setDrawerProps({ loading: true });
     await resetFields();
     handleCount.value = data.isUpdate;

@@ -74,8 +74,7 @@ import {columns, searchFormSchema} from "./index";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {getPlanList} from "/@/api/equipment/chenkPlan";
 import { planModal } from './components/index';
-import {Button, Popconfirm, Switch, Tag} from "ant-design-vue";
-import Icon from "/@/components/Icon";
+import {Button, Switch, Tag} from "ant-design-vue";
 import {Authority} from "/@/components/Authority";
 import {useModal} from "/@/components/Modal";
 import {deleteEquipmentPlan} from "/@/api/equipment/chenkPlan";
@@ -91,7 +90,7 @@ import {useDrawer} from "/@/components/Drawer";
 const [registerApplicationApiFormDrawer, { openDrawer }] = useDrawer();
 const [
   registerTable,
-  { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+  { reload, setLoading, setSelectedRowKeys },
 ] = useTable({
   title: t('equipment.checkPlan.listText'),
   api: getPlanList,
@@ -115,7 +114,7 @@ const [
   },
   rowSelection: {
     type: 'checkbox',
-    getCheckboxProps: (record: any) => {},
+    getCheckboxProps: () => {},
   },
 });
 

@@ -3,22 +3,19 @@
   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 _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({
+  const [registerForm, { resetFields, setFieldsValue, setProps }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -32,7 +29,7 @@
       : t('application.api.action.detail')
   );
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  const [registerDrawer, { setDrawerProps }] = useDrawerInner(async (data) => {
     setDrawerProps({ loading: true });
     await resetFields();
     handleCount.value = data.isUpdate;

@@ -75,7 +75,7 @@ const { t } = useI18n();
 // 定义人员选项
 const Options = ref([]);
 const searchInfo = reactive<Recordable>({});
-const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+const { organizationIdTreeRef } = useResetOrganizationTree(searchInfo);
 const userVisible = ref(false);
 const userModalTitle = ref('选人');
 const selectedItem = ref<{ id: string; username: string } | null>(null);
@@ -95,7 +95,7 @@ const selectedUsername = computed({
 });
 
 const emits = defineEmits(['success', 'register']);
-const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, setProps }] = useForm(
+const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm(
   {
     labelWidth: 140,
     schemas: formSchema,

 import {FormSchema as BFormSchema, useComponentRegister} from "../../../../components/Form";
-import {useI18n} from "../../../../hooks/web/useI18n";
+import {useI18n} from "/@/hooks/web/useI18n";
 const { t } = useI18n();
 import { CategoryTreeSelect } from '../../../common/CategoryTreeSelect';
 import { OrgTreeSelect } from '../../../common/OrgTreeSelect';

@@ -50,7 +50,7 @@ const { createMessage } = useMessage();
 
 const [
   registerTable,
-  { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+  { reload, setLoading, getSelectRowKeys, setSelectedRowKeys },
 ] = useTable({
   title: t('equipment.supplier.listText'),
   api: getSupplierList,
@@ -74,7 +74,7 @@ const [
   },
   rowSelection: {
     type: 'checkbox',
-    getCheckboxProps: (record: any) => {},
+    getCheckboxProps: () => {},
   },
 });
 

@@ -127,7 +127,7 @@ const initialData = ref({
 
 const [
   registerTable,
-  { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+  { reload, setLoading, setSelectedRowKeys  },
 ] = useTable({
   title: t('inspection.inspectionPlan.listText'),
   api: getInspectionPlanList,
@@ -151,7 +151,7 @@ const [
   },
   rowSelection: {
     type: 'checkbox',
-    getCheckboxProps: (record: any) => {},
+    getCheckboxProps: () => {},
   },
 });
 

@@ -73,7 +73,6 @@
   const isViewMode = ref(false);
   const modalTitle = ref('');
   import { dateFormat } from '/@/utils/common/compUtils';
-  import {getRecordDetail} from "/@/api/inspection/serviceRecord";
   const initialData = ref({
     form: {
       code: '',
@@ -87,7 +86,7 @@
   });
   const [
     registerTable,
-    { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+    { reload, setLoading, setSelectedRowKeys,  },
   ] = useTable({
     title: t('inspection.inspectionRecord.listText'),
     api: getInspectionRecordList,
@@ -111,7 +110,7 @@
     },
     rowSelection: {
       type: 'checkbox',
-      getCheckboxProps: (record: any) => {},
+      getCheckboxProps: () => {},
     },
   });
 

@@ -99,13 +99,10 @@
   import { servicePlanModal } from "./components/index"
   import { columns, searchFormSchema } from './index';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import {Button, message, Tag} from 'ant-design-vue';
-  import {useModal} from "/@/components/Modal";
+  import {Button, Tag} from 'ant-design-vue';
   import {useMessage} from "/@/hooks/web/useMessage";
   const { t } = useI18n();
   import { ref } from "vue"
-  import {getPreservePlanDetail} from "/@/api/inspection/inspectionPlan";
-  const [registerModal, { openModal }] = useModal();
   const { createMessage } = useMessage();
   const modalVisible = ref(false);
   const isViewMode = ref(false);
@@ -122,7 +119,7 @@
   });
   const [
     registerTable,
-    { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+    { reload, setLoading, setSelectedRowKeys, },
   ] = useTable({
     title: t('inspection.servicePlan.listText'),
     api: getServicePlanList,
@@ -146,7 +143,7 @@
     },
     rowSelection: {
       type: 'checkbox',
-      getCheckboxProps: (record: any) => {},
+      getCheckboxProps: () => {},
     },
   });
 
@@ -167,11 +164,9 @@
   };
 
   const handleSubmit = async (data) => {
-    console.log('提交的数据:', data);
-
     modalVisible.value = false;
     await savePreservePlan(data)
-    message.success('提交成功');
+    createMessage.success('提交成功');
     handleReload()
   };
 

@@ -72,12 +72,12 @@
       </a-row>
       <a-form-item label="保养明细" name="preserveDetailList">
         <a-table bordered :data-source="tableData" :columns="columns">
-          <template #deviceInfo="{ text, record, index }">
+          <template #deviceInfo="{ record }">
             <div>
               {{record?.deviceInfo.name}}
             </div>
           </template>
-          <template #status="{ text, record, index }">
+          <template #status="{ record }">
             <div>
               <a-select
                 v-model:value="record.status"
@@ -88,7 +88,7 @@
               />
             </div>
           </template>
-          <template #operation="{ text, record, index }">
+          <template #operation="{index }">
             <div>
               <a-button type="link" @click="handleDelete(index)" :disabled="isViewMode">删除</a-button>
             </div>
@@ -119,13 +119,9 @@
 </template>
 <script setup lang="ts">
 // 定义 props
-import {computed, onMounted, ref, unref, watch, reactive} from "vue";
+import {onMounted, ref, watch, reactive} from "vue";
 import {getServicePlanList} from "/@/api/inspection/servicePlan";
-import { ApiTreeSelect } from '/@/components/Form';
 import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
-import {OrganizationListItem} from "/@/api/system/model/systemModel";
-import {getOrganizationList} from "/@/api/system/system";
-import {useI18n} from "/@/hooks/web/useI18n";
 import {getUserListByOrg} from "/@/api/equipment/ledger";
 import {useUserStore} from "/@/store/modules/user";
 import {serveRecordDetail} from "/@/api/inspection/serviceRecord";
@@ -133,7 +129,7 @@ import {useMessage} from "/@/hooks/web/useMessage";
 const { createMessage } = useMessage();
 
 const searchInfo = reactive<Recordable>({});
-const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+const { organizationIdTreeRef } = useResetOrganizationTree(searchInfo);
 const userVisible = ref(false);
 const userModalTitle = ref('选人');
 const selectedItem = ref<{ id: number; username: string } | null>(null);
@@ -238,56 +234,7 @@ const columns = [
   }
 ];
 
-
 const userInfo = useUserStore();
-const timespan = ref(Date.now());
-const orgList = ref<Recordable[]>([]);
-const { t } = useI18n();
-const needReload = ref(true);
-const getBindProps = computed<Recordable>(() => {
- const params = {}
-  return {
-    replaceFields: { children: 'children', key: 'id', title: 'name', value: 'id' },
-    getPopupContainer: () => document.body,
-    placeholder: t('deviceManagement.device.organizationPlaceholderText'),
-    maxLength: 250,
-    value: form.orgId,
-    dropdownStyle: { maxHeight: '300px' },
-    api: async (params: OrganizationListItem) => {
-      try {
-        const result = ((await getOrganizationList(params)) as unknown as Recordable[]) || [];
-        orgList.value = result;
-        needReload.value = false;
-        return result;
-      } catch (error) {
-        return unref(orgList);
-      }
-    },
-    params: {
-      ...params,
-      _t: unref(timespan),
-    },
-    onChange: async (...args: any[]) => {
-      const _data = {
-        page: '1',
-        pageSize: '999',
-        tenantId: userInfo.getUserInfo.tenantId!,
-        organizationId: args?.[0]
-      }
-      const response = await getUserListByOrg(_data); // 调用接口
-      Options.value = response.items?.map((item: any) => {
-        return {
-          label: item.username,
-          value: item.id,
-        }
-      });
-      form.orgId.value = args?.[0]
-
-    },
-  };
-});
-
-
 // 监听 initialData 的变化
 watch(
   () => props.initialData,

 import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
-import {getServicePlanList} from "../../../api/inspection/servicePlan";
+import {getServicePlanList} from "/@/api/inspection/servicePlan";
 const { t } = useI18n();
 
 

@@ -92,7 +92,7 @@ const initialData = ref({
 
 const [
   registerTable,
-  { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+  { reload, setLoading,  setSelectedRowKeys,  },
 ] = useTable({
   title: t('inspection.serviceRecord.listText'),
   api: getServiceRecordList,
@@ -116,7 +116,7 @@ const [
   },
   rowSelection: {
     type: 'checkbox',
-    getCheckboxProps: (record: any) => {},
+    getCheckboxProps: () => {},
   },
 });
 
@@ -173,7 +173,6 @@ const handleEdit = async (record?: any) => {
   modalTitle.value = '修改';
   try {
     const response = await getRecordDetail({id})
-    console.log(response,'res')
     initialData.value = {
       form: response, // 表单数据
       tableData: response.preserveDetailStatusList, // 表格数据

@@ -24,7 +24,7 @@
   const { t } = useI18n();
   const [
     registerTable,
-    { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+
   ] = useTable({
     title: t('repair.history.listText'),
     api: getRepairHistoryList,

@@ -3,22 +3,19 @@
   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 _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({
+  const [registerForm, { resetFields,setFieldsValue, setProps }] = useForm({
     labelWidth: 120,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -32,7 +29,7 @@
       : t('application.api.action.detail')
   );
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  const [registerDrawer, { setDrawerProps, }] = useDrawerInner(async (data) => {
     setDrawerProps({ loading: true });
     await resetFields();
     handleCount.value = data.isUpdate;

@@ -67,7 +67,7 @@ const { createMessage } = useMessage();
 const userOptions = ref([]);
 const Options = ref([]);
 const searchInfo = reactive<Recordable>({});
-const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+const { organizationIdTreeRef } = useResetOrganizationTree(searchInfo);
 const userVisible = ref(false);
 const userModalTitle = ref('选人');
 const selectedItem = ref<{ id: string; username: string } | null>(null);

@@ -87,12 +87,12 @@
   import {useDrawer} from "/@/components/Drawer";
   import {deleteRepairOrder} from "/@/api/repair/order";
   import {useMessage} from "/@/hooks/web/useMessage";
-  const [registerApplicationApiFormDrawer, { openDrawer }] = useDrawer();
+  const [registerApplicationApiFormDrawer, {  }] = useDrawer();
   const { createMessage } = useMessage();
 
   const [
     registerTable,
-    { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
+    { reload, setLoading,  setSelectedRowKeys },
   ] = useTable({
     title: t('repair.order.listText'),
     api: getRepairOrderList,
@@ -116,7 +116,7 @@
     },
     rowSelection: {
       type: 'checkbox',
-      getCheckboxProps: (record: any) => {},
+      getCheckboxProps: () => {},
     },
   });
 
@@ -132,13 +132,6 @@
     });
   };
 
-  const handleDetail = (record?: any) => {
-    openDrawer(true, {
-      isUpdate: 2,
-      record,
-    });
-  };
-
   // 编辑
   const handleEdit = (record?: any) => {
     openModal(true, {