commit：针对中建材滕峰公司得改动

@@ -31,6 +31,12 @@ import { getEntitiesId } from '/@/api/dashboard/index';
 import { useRole } from '/@/hooks/business/useRole';
 import { useLocaleStore } from './locale';
 
+export const TARGET_TENANT_ID = '0414df80-f01d-11f0-9cb8-e3376d1e7978';
+
+export function isTargetTenantId(tenantId?: string | null) {
+  return tenantId === TARGET_TENANT_ID;
+}
+
 interface PlatInfoType {
   id: string;
   creator: string;
@@ -91,6 +97,12 @@ export const useUserStore = defineStore({
     getUserInfo(): UserInfo {
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
     },
+    getTenantId(): string | undefined {
+      return this.getUserInfo?.tenantId;
+    },
+    isTargetTenant(): boolean {
+      return isTargetTenantId(this.getTenantId);
+    },
 
     getUserUpdateInfo(): UserUpdateInfo {
       return this.userUpdateInfo || {};

@@ -51,7 +51,7 @@ import {computed, nextTick, reactive, ref} from "vue";
 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
 import { SchemaFiled} from "../../config/enum";
 import {BasicForm, FileItem, useForm} from "/@/components/Form";
-import {formSchema} from "../../config/data";
+import { getFormSchema } from "../../config/data";
 import {useHooks} from "/@/views/report/config/hooks/index.hooks";
 import {getUserListByOrg,ledgerEditDetailPage,saveLedger } from "/@/api/equipment/ledger"
 import {useUserStore} from "/@/store/modules/user";
@@ -98,7 +98,7 @@ const emits = defineEmits(['success', 'register']);
 const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm(
   {
     labelWidth: 140,
-    schemas: formSchema,
+    schemas: getFormSchema(userInfo.isTargetTenant),
     showActionButtonGroup: false,
     fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
   }

@@ -13,208 +13,223 @@ const statusOptions = [
   { label: t('equipment.ledger.FAULT'), value: 'FAULT' },
   { label: t('equipment.ledger.SCRAP'), value: 'SCRAP' },
 ];
-export const formSchema: BFormSchema[] = [
-  {
-    field: 'image',
-    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: 'code',
-    label: t('equipment.ledger.nameCode'),
-    component: 'Input',
-    colProps: { span: 24 },
-    required: true,
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'name',
-    label: t('equipment.ledger.deviceName'),
-    component: 'Input',
-    colProps: { span: 24 },
-    required: true,
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'categoryId',
-    label: t('equipment.category.categoryText'),
-    colProps: { span: 24 },
-    component: 'CategoryTreeSelect',
-    required: true,
-  },
-  {
-    field: 'status',
-    component: 'Select',
-    label: t('equipment.ledger.status'),
-    required: true,
-    colProps: { span: 24 },
-    defaultValue: 'NORMAL',
-    componentProps: {
-      options: statusOptions,
-    },
-  },
-  {
-    field: 'isOnline',
-    component: 'Select',
-    label: '是否联网',
-    required: true,
-    colProps: { span: 24 },
-    componentProps: {
-      options: [
-        {
-          label: '是',
-          value: true,
-        },
-        {
-          label: '否',
-          value: false,
-        }
-      ],
-    },
-  },
-  {
-    field: 'brand',
-    label: t('equipment.ledger.brandText'),
-    component: 'Input',
-    colProps: { span: 24 },
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'modelNum',
-    label: t('equipment.ledger.modelNumText'),
-    component: 'Input',
-    colProps: { span: 24 },
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'specifications',
-    label: t('equipment.ledger.specificationsText'),
-    component: 'Input',
-    colProps: { span: 24 },
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'specifications',
-    label: t('equipment.ledger.manufacturerText'),
-    component: 'Input',
-    colProps: { span: 24 },
-    componentProps: {
-      maxLength: 20,
-    },
-  },
-  {
-    field: 'buyDate',
-    label: t('equipment.ledger.buyDate'),
-    component: 'DatePicker',
-    colProps: { span: 24 },
-    componentProps: {
-      format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
-      showTime: true, // 显示时间选择器
-    },
-  },
-{
-    field: 'price',
-    label: t('equipment.ledger.priceText'),
-    component: 'InputNumber',
-    colProps: { span: 24 },
-    componentProps: {
-    },
-  },
-  {
-    field: 'productDate',
-    label: t('equipment.ledger.productDate'),
-    component: 'DatePicker',
-    colProps: { span: 24 },
-    componentProps: {
-      format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
-      showTime: true, // 显示时间选择器
-    },
-  },
-  {
-    field: 'receiveDate',
-    label: t('equipment.ledger.receiveDate'),
-    component: 'DatePicker',
-    colProps: { span: 24 },
-    componentProps: {
-      format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
-      showTime: true, // 显示时间选择器
-    },
-  },
-  {
-    field: 'registeDate',
-    label: t('equipment.ledger.registeDate'),
-    component: 'DatePicker',
-    colProps: { span: 24 },
-    componentProps: {
-      format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
-      showTime: true, // 显示时间选择器
-    },
-  },
-  {
-    field: 'supplierId',
-    component: 'ApiSelect',
-    label: '供应商',
-    colProps: { span: 24 },
-    required: true,
-    componentProps: ({  }) => {
-      return {
-        api: supplierListPull,
-        params: {
+export function getFormSchema(isTargetTenant: boolean): BFormSchema[] {
+  const codeLabel = isTargetTenant ? '设备位号' : t('equipment.ledger.nameCode');
 
-        },
-        labelField: 'name',
-        valueField: 'id',
-        getPopupContainer: () => document.body,
-      };
-    },
-  },
-  {
-    field: 'description',
-    label: t('equipment.ledger.description'),
-    component: 'InputTextArea',
-    colProps: { span: 24 },
-    componentProps: {
-      maxLength: 200,
-    },
-  },
+  const schema: BFormSchema[] = [
+    {
+      field: 'image',
+      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: 'code',
+      label: codeLabel,
+      component: 'Input',
+      colProps: { span: 24 },
+      required: true,
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'name',
+      label: t('equipment.ledger.deviceName'),
+      component: 'Input',
+      colProps: { span: 24 },
+      required: true,
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'categoryId',
+      label: t('equipment.category.categoryText'),
+      colProps: { span: 24 },
+      component: 'CategoryTreeSelect',
+      required: true,
+    },
+    {
+      field: 'status',
+      component: 'Select',
+      label: t('equipment.ledger.status'),
+      required: true,
+      colProps: { span: 24 },
+      defaultValue: 'NORMAL',
+      componentProps: {
+        options: statusOptions,
+      },
+    },
+    {
+      field: 'isOnline',
+      component: 'Select',
+      label: '是否联网',
+      required: true,
+      colProps: { span: 24 },
+      componentProps: {
+        options: [
+          {
+            label: '是',
+            value: true,
+          },
+          {
+            label: '否',
+            value: false,
+          },
+        ],
+      },
+    },
+    {
+      field: 'brand',
+      label: t('equipment.ledger.brandText'),
+      component: 'Input',
+      colProps: { span: 24 },
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'modelNum',
+      label: t('equipment.ledger.modelNumText'),
+      component: 'Input',
+      colProps: { span: 24 },
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'specifications',
+      label: t('equipment.ledger.specificationsText'),
+      component: 'Input',
+      colProps: { span: 24 },
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'specifications',
+      label: t('equipment.ledger.manufacturerText'),
+      component: 'Input',
+      colProps: { span: 24 },
+      componentProps: {
+        maxLength: 20,
+      },
+    },
+    {
+      field: 'buyDate',
+      label: t('equipment.ledger.buyDate'),
+      component: 'DatePicker',
+      colProps: { span: 24 },
+      componentProps: {
+        format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
+        showTime: true, // 显示时间选择器
+      },
+    },
+    {
+      field: 'price',
+      label: t('equipment.ledger.priceText'),
+      component: 'InputNumber',
+      colProps: { span: 24 },
+      componentProps: {},
+    },
+    {
+      field: 'productDate',
+      label: t('equipment.ledger.productDate'),
+      component: 'DatePicker',
+      colProps: { span: 24 },
+      componentProps: {
+        format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
+        showTime: true, // 显示时间选择器
+      },
+    },
+    {
+      field: 'receiveDate',
+      label: t('equipment.ledger.receiveDate'),
+      component: 'DatePicker',
+      colProps: { span: 24 },
+      componentProps: {
+        format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
+        showTime: true, // 显示时间选择器
+      },
+    },
+    {
+      field: 'registeDate',
+      label: t('equipment.ledger.registeDate'),
+      component: 'DatePicker',
+      colProps: { span: 24 },
+      componentProps: {
+        format: 'YYYY-MM-DD hh:mm:ss', // 设置日期格式
+        showTime: true, // 显示时间选择器
+      },
+    },
+    {
+      field: 'supplierId',
+      component: 'ApiSelect',
+      label: '供应商',
+      colProps: { span: 24 },
+      required: true,
+      componentProps: ({}) => {
+        return {
+          api: supplierListPull,
+          params: {},
+          labelField: 'name',
+          valueField: 'id',
+          getPopupContainer: () => document.body,
+        };
+      },
+    },
+    {
+      field: 'description',
+      label: t('equipment.ledger.description'),
+      component: 'InputTextArea',
+      colProps: { span: 24 },
+      componentProps: {
+        maxLength: 200,
+      },
+    },
+  ];
 
-];
+  if (isTargetTenant) {
+    schema.splice(schema.length - 1, 0, {
+      field: 'techFeature',
+      label: '主要技术特征',
+      component: 'InputTextArea',
+      colProps: { span: 24 },
+      componentProps: {
+        rows: 4,
+        maxLength: 2000,
+      },
+    });
+  }
+
+  return schema;
+}

@@ -66,8 +66,10 @@ export enum DeviceListAuthEnum {
   UPDATE_PRODUCT = 'api:yt:device:update:product',
 }
 
-// 表格列数据
-export const columns: BasicColumn[] = [
+export function getColumns(isTargetTenant: boolean): BasicColumn[] {
+  const codeTitle = isTargetTenant ? '设备位号' : t('business.codeText');
+
+  return [
   {
     title: t('repair.order.situationImg'),
     dataIndex: 'deviceImg',
@@ -82,7 +84,7 @@ export const columns: BasicColumn[] = [
     slots: { customRender: 'status' },
   },
   {
-    title: t('business.codeText'),
+    title: codeTitle,
     dataIndex: 'code',
     width: 100,
   },
@@ -157,29 +159,47 @@ export const columns: BasicColumn[] = [
     dataIndex: 'brand',
     width: 120,
   },
-];
+  ];
+}
 
-// 查询字段
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'code',
-    label: t('equipment.ledger.deviceCode'),
-    component: 'Input',
-    colProps: { span: 6 },
-    componentProps: {
-      maxLength: 255,
+export function getSearchFormSchema(isTargetTenant: boolean): FormSchema[] {
+  const codeLabel = isTargetTenant ? '设备位号' : t('equipment.ledger.deviceCode');
+
+  const schema: FormSchema[] = [
+    {
+      field: 'code',
+      label: codeLabel,
+      component: 'Input',
+      colProps: { span: 6 },
+      componentProps: {
+        maxLength: 255,
+      },
     },
-  },
-  {
-    field: 'status',
-    label: t('business.deviceStatusText'),
-    component: 'Select',
-    componentProps: {
-      options: Object.values(SbStatusEnum).map((value) => ({
-        label: t(`enum.sbStatus.${value}`),
-        value,
-      })),
+    {
+      field: 'status',
+      label: t('business.deviceStatusText'),
+      component: 'Select',
+      componentProps: {
+        options: Object.values(SbStatusEnum).map((value) => ({
+          label: t(`enum.sbStatus.${value}`),
+          value,
+        })),
+      },
+      colProps: { span: 6 },
     },
-    colProps: { span: 6 },
+  ];
+
+  if (isTargetTenant) {
+    schema.splice(1, 0, {
+      field: 'name',
+      label: t('equipment.ledger.deviceName'),
+      component: 'Input',
+      colProps: { span: 6 },
+      componentProps: {
+        maxLength: 255,
+      },
+    });
   }
-];
+
+  return schema;
+}

@@ -82,8 +82,8 @@ import {BasicTable, TableAction, TableImg, useTable} from "/@/components/Table";
 import {OrganizationIdTree, useResetOrganizationTree} from "/@/views/common/organizationIdTree";
 import { getLedgerList, deleteLedger } from "/@/api/equipment/ledger"
 import {
-  columns,
-  searchFormSchema
+  getColumns,
+  getSearchFormSchema
 } from "/@/views/equipment/ledger/config/ledger.data";
 import { SbStatusEnum } from '/@/enums/deviceEnum';
 
@@ -94,6 +94,7 @@ import {Authority} from "/@/components/Authority";
 import {getAuthCache} from "/@/utils/auth";
 import {USER_INFO_KEY} from "/@/enums/cacheEnum";
 import {useMessage} from "/@/hooks/web/useMessage";
+import { useUserStore } from '/@/store/modules/user';
 
 import {useDrawer} from "/@/components/Drawer";
 
@@ -102,6 +103,9 @@ const [registerDrawer, { openDrawer }] = useDrawer();
 const { t } = useI18n();
 const userInfo: any = getAuthCache(USER_INFO_KEY);
 const role: string = userInfo.roles[0];
+const userStore = useUserStore();
+const columns = getColumns(userStore.isTargetTenant);
+const searchFormSchema = getSearchFormSchema(userStore.isTargetTenant);
 
 const { createMessage } = useMessage();
 

@@ -70,7 +70,11 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-form-item label="巡检明细" name="tkCheckDetailsDTOList">
+      <a-form-item label="巡检明细" 
+      name="tkCheckDetailsDTOList"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 19 }"
+      >
         <div style="text-align: end">
           <a-button class="editable-add-btn" type="primary" @click="handleAdd" style="margin-bottom: 8px" :disabled="isViewMode">
             <template #icon>
@@ -86,13 +90,23 @@
             </template>
             <template #checkDeviceId="{ text, record, index }">
               <div>
-                <a-select
-                  v-model:value="record.checkDeviceId"
-                  :options="Options"
-                  :disabled="isViewMode"
-                  :field-names="{ label: 'name', value: 'id' }"
-                  placeholder="请选择"
-                />
+                <template v-if="userStore.isTargetTenant">
+                  <div style="display: flex; gap: 8px">
+                    <a-input :value="getDeviceLabel(record)" :disabled="true" placeholder="请选择" />
+                    <a-button type="primary" @click="goChooseDevice(record)" :disabled="isViewMode">
+                      选设备
+                    </a-button>
+                  </div>
+                </template>
+                <template v-else>
+                  <a-select
+                    v-model:value="record.checkDeviceId"
+                    :options="Options"
+                    :disabled="isViewMode"
+                    :field-names="{ label: 'name', value: 'id' }"
+                    placeholder="请选择"
+                  />
+                </template>
               </div>
             </template>
             <template #checkPlanId="{ text, record, index }">
@@ -121,14 +135,45 @@
       </a-form-item>
     </a-form>
   </a-modal>
+  <a-modal
+    v-model:visible="deviceVisible"
+    title="选择设备"
+    width="70vw"
+    height="60vh"
+    @ok="handleDeviceOk"
+    @cancel="handleDeviceCancel"
+  >
+    <div style="padding: 20px">
+      <div style="display: flex; gap: 12px; margin-bottom: 12px">
+        <a-input
+          v-model:value="deviceSearchInfo.code"
+          placeholder="设备位号"
+          allowClear
+          style="width: 240px"
+        />
+        <a-input
+          v-model:value="deviceSearchInfo.name"
+          placeholder="设备名称"
+          allowClear
+          style="width: 240px"
+        />
+        <a-button type="primary" @click="handleDeviceSearch">搜索</a-button>
+        <a-button @click="handleDeviceReset">重置</a-button>
+      </div>
+      <BasicTable @register="registerDeviceTable" />
+    </div>
+  </a-modal>
 </template>
 <script setup lang="ts">
 // 定义 props
-import {onMounted, ref, watch} from "vue";
+import {onMounted, ref, watch, reactive} from "vue";
 import {getLedgerList} from "/@/api/equipment/ledger";
 import {getPlanList} from "/@/api/equipment/chenkPlan";
+import { useUserStore } from '/@/store/modules/user';
+import { BasicTable, useTable } from '/@/components/Table';
 const Options = ref([]);
 const planOptions = ref([]);
+const userStore = useUserStore();
 const props = defineProps({
   initialData: {
     type: Object,
@@ -209,6 +254,33 @@ const modalTitle = ref(props.modalTitle);
 const form = ref({ ...props.initialData.form });
 const tableData = ref([...props.initialData.tableData]);
 const emit = defineEmits(['update:visible', 'submit']);
+const deviceVisible = ref(false);
+const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
+const selectedDevice = ref<any>(null);
+const activeDeviceRecord = ref<any>(null);
+
+const [registerDeviceTable, { reload: reloadDeviceTable }] = useTable({
+  api: getLedgerList,
+  columns: [
+    { title: '设备位号', dataIndex: 'code', width: 160 },
+    { title: '设备名称', dataIndex: 'name', width: 240 },
+  ],
+  searchInfo: deviceSearchInfo,
+  useSearchForm: false,
+  showTableSetting: false,
+  bordered: true,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  rowKey: 'id',
+  pagination: { pageSize: 10 },
+  rowSelection: {
+    type: 'radio',
+    onSelect: (record) => {
+      selectedDevice.value = record;
+    },
+    onSelectAll: () => {},
+  },
+});
 // 监听 visible 的变化
 watch(
   () => props.visible,
@@ -251,22 +323,51 @@ const fetchAgeOptions = async () => {
   try {
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'INSPECTION' }); // 调用接口
-    Options.value = response.items?.map((item: any) => {
-      return {
-        value: item?.id,
-        label: item?.name
-      }
-    })
-    planOptions.value = response1.items?.map((item: any) => {
-      return {
-        value: item?.id,
-        label: item?.name
-      }
-    });
+    Options.value = response.items || [];
+    planOptions.value = response1.items || [];
   } catch (error) {
     console.error('失败:', error);
   }
 };
+
+const getDeviceLabel = (record: any) => {
+  const code = record?.deviceCode;
+  const name = record?.deviceName;
+  if (code && name) return `${code} / ${name}`;
+  return name || code || '';
+};
+
+const goChooseDevice = (record: any) => {
+  activeDeviceRecord.value = record;
+  selectedDevice.value = null;
+  deviceVisible.value = true;
+  reloadDeviceTable();
+};
+
+const handleDeviceSearch = () => {
+  reloadDeviceTable();
+};
+
+const handleDeviceReset = () => {
+  deviceSearchInfo.code = '';
+  deviceSearchInfo.name = '';
+  reloadDeviceTable();
+};
+
+const handleDeviceOk = () => {
+  if (!selectedDevice.value?.id || !activeDeviceRecord.value) {
+    deviceVisible.value = false;
+    return;
+  }
+  activeDeviceRecord.value.checkDeviceId = selectedDevice.value.id;
+  activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
+  activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  deviceVisible.value = false;
+};
+
+const handleDeviceCancel = () => {
+  deviceVisible.value = false;
+};
 const handleAdd = () => {
   tableData.value.push({
     code: '',

@@ -70,11 +70,25 @@
         </a-col>
 
       </a-row>
-      <a-form-item label="巡检明细" name="tkInspectionDetailsDTOList">
+      <a-form-item label="巡检明细" 
+      name="tkInspectionDetailsDTOList"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 19 }"
+      >
         <a-table bordered :data-source="tableData" :columns="columns">
-          <template #tkDeviceAccountDTO="{record}">
+          <template #tkDeviceAccountDTO="{ record }">
             <div>
-              {{record?.tkDeviceAccountDTO?.name}}
+              <template v-if="userInfo.isTargetTenant">
+                <div style="display: flex; gap: 8px">
+                  <a-input :value="getDeviceLabel(record)" :disabled="true" placeholder="请选择" />
+                  <a-button type="primary" @click="goChooseDevice(record)" :disabled="isViewMode">
+                    选设备
+                  </a-button>
+                </div>
+              </template>
+              <template v-else>
+                {{ record?.tkDeviceAccountDTO?.name }}
+              </template>
             </div>
           </template>
           <template #recordResult="{ record }">
@@ -115,6 +129,34 @@
       </div>
     </a-modal>
   </a-modal>
+  <a-modal
+    v-model:visible="deviceVisible"
+    title="选择设备"
+    width="70vw"
+    height="60vh"
+    @ok="handleDeviceOk"
+    @cancel="handleDeviceCancel"
+  >
+    <div style="padding: 20px">
+      <div style="display: flex; gap: 12px; margin-bottom: 12px">
+        <a-input
+          v-model:value="deviceSearchInfo.code"
+          placeholder="设备位号"
+          allowClear
+          style="width: 240px"
+        />
+        <a-input
+          v-model:value="deviceSearchInfo.name"
+          placeholder="设备名称"
+          allowClear
+          style="width: 240px"
+        />
+        <a-button type="primary" @click="handleDeviceSearch">搜索</a-button>
+        <a-button @click="handleDeviceReset">重置</a-button>
+      </div>
+      <BasicTable @register="registerDeviceTable" />
+    </div>
+  </a-modal>
 </template>
 <script setup lang="ts">
 import {computed, onMounted, reactive, ref, unref, watch} from "vue";
@@ -126,6 +168,8 @@ import {useUserStore} from "/@/store/modules/user";
 import {useI18n} from "/@/hooks/web/useI18n";
 import {useMessage} from "/@/hooks/web/useMessage";
 import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
+import { BasicTable, useTable } from '/@/components/Table';
+import { getLedgerList } from '/@/api/equipment/ledger';
 interface Value {
   value?: string;
   label?: string;
@@ -202,6 +246,10 @@ const emit = defineEmits(['update:visible', 'submit']);
 const planOptions = ref([]);
 const Options = ref([]);
 const userInfo = useUserStore();
+const deviceVisible = ref(false);
+const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
+const selectedDevice = ref<any>(null);
+const activeDeviceRecord = ref<any>(null);
 const timespan = ref(Date.now());
 const orgList = ref<Recordable[]>([]);
 const { t } = useI18n();
@@ -220,6 +268,29 @@ const radioStyle = reactive({
   lineHeight: '30px',
 });
 
+const [registerDeviceTable, { reload: reloadDeviceTable }] = useTable({
+  api: getLedgerList,
+  columns: [
+    { title: '设备位号', dataIndex: 'code', width: 160 },
+    { title: '设备名称', dataIndex: 'name', width: 240 },
+  ],
+  searchInfo: deviceSearchInfo,
+  useSearchForm: false,
+  showTableSetting: false,
+  bordered: true,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  rowKey: 'id',
+  pagination: { pageSize: 10 },
+  rowSelection: {
+    type: 'radio',
+    onSelect: (record) => {
+      selectedDevice.value = record;
+    },
+    onSelectAll: () => {},
+  },
+});
+
 // 监听 visible 的变化
 watch(
   () => props.visible,
@@ -320,11 +391,58 @@ const handleChange = async (value: Value) => {
       checkDeviceId: item?.checkDeviceId || '',
       recordResult: true,
       planDetails: item?.planDetails || '',
-      tkDeviceAccountDTO: item?.tkDeviceAccountDTO
+      tkDeviceAccountDTO: item?.tkDeviceAccountDTO,
+      deviceCode: item?.tkDeviceAccountDTO?.code || item?.deviceCode,
+      deviceName: item?.tkDeviceAccountDTO?.name || item?.deviceName,
     }
   }) || []
 };
 
+const getDeviceLabel = (record: any) => {
+  const code = record?.deviceCode;
+  const name = record?.deviceName;
+  if (code && name) return `${code} / ${name}`;
+  return name || code || '';
+};
+
+const goChooseDevice = (record: any) => {
+  activeDeviceRecord.value = record;
+  selectedDevice.value = null;
+  deviceVisible.value = true;
+  reloadDeviceTable();
+};
+
+const handleDeviceSearch = () => {
+  reloadDeviceTable();
+};
+
+const handleDeviceReset = () => {
+  deviceSearchInfo.code = '';
+  deviceSearchInfo.name = '';
+  reloadDeviceTable();
+};
+
+const handleDeviceOk = () => {
+  if (!selectedDevice.value?.id || !activeDeviceRecord.value) {
+    deviceVisible.value = false;
+    return;
+  }
+  activeDeviceRecord.value.checkDeviceId = selectedDevice.value.id;
+  activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
+  activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  activeDeviceRecord.value.tkDeviceAccountDTO = {
+    ...(activeDeviceRecord.value.tkDeviceAccountDTO || {}),
+    id: selectedDevice.value.id,
+    code: selectedDevice.value.code,
+    name: selectedDevice.value.name,
+  };
+  deviceVisible.value = false;
+};
+
+const handleDeviceCancel = () => {
+  deviceVisible.value = false;
+};
+
 const handleOk = () => {
   if (isViewMode.value) {
     visible.value = false;

@@ -43,7 +43,12 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-form-item label="保养明细" name="preserveDetailList">
+      <a-form-item
+        label="保养明细"
+        name="preserveDetailList"
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 19 }"
+      >
         <div style="text-align: end">
           <a-button class="editable-add-btn" type="primary" @click="handleAdd" style="margin-bottom: 8px" :disabled="isViewMode">
             <template #icon>
@@ -60,13 +65,23 @@
           </template>
           <template #deviceId="{ text, record, index }">
             <div>
-              <a-select
-                v-model:value="record.deviceId"
-                :options="Options"
-                :disabled="isViewMode"
-                :field-names="{ label: 'name', value: 'id' }"
-                placeholder="请选择"
-              />
+              <template v-if="userStore.isTargetTenant">
+                <div style="display: flex; gap: 8px">
+                  <a-input :value="getDeviceLabel(record)" :disabled="true" placeholder="请选择" />
+                  <a-button type="primary" @click="goChooseDevice(record)" :disabled="isViewMode">
+                    选设备
+                  </a-button>
+                </div>
+              </template>
+              <template v-else>
+                <a-select
+                  v-model:value="record.deviceId"
+                  :options="Options"
+                  :disabled="isViewMode"
+                  :field-names="{ label: 'name', value: 'id' }"
+                  placeholder="请选择"
+                />
+              </template>
             </div>
           </template>
           <template #checkPlanId="{ record }">
@@ -77,6 +92,7 @@
                 :disabled="isViewMode"
                 :fieldNames="{ label: 'name', value: 'id' }"
                 placeholder="请选择"
+                @change="(value) => handleCheckPlanChange(value, record)"
               />
             </div>
           </template>
@@ -94,17 +110,48 @@
       </a-form-item>
     </a-form>
   </a-modal>
+  <a-modal
+    v-model:visible="deviceVisible"
+    title="选择设备"
+    width="70vw"
+    height="60vh"
+    @ok="handleDeviceOk"
+    @cancel="handleDeviceCancel"
+  >
+    <div style="padding: 20px">
+      <div style="display: flex; gap: 12px; margin-bottom: 12px">
+        <a-input
+          v-model:value="deviceSearchInfo.code"
+          placeholder="设备位号"
+          allowClear
+          style="width: 240px"
+        />
+        <a-input
+          v-model:value="deviceSearchInfo.name"
+          placeholder="设备名称"
+          allowClear
+          style="width: 240px"
+        />
+        <a-button type="primary" @click="handleDeviceSearch">搜索</a-button>
+        <a-button @click="handleDeviceReset">重置</a-button>
+      </div>
+      <BasicTable @register="registerDeviceTable" />
+    </div>
+  </a-modal>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch  } from 'vue';
+import { ref, onMounted, watch, reactive } from 'vue';
 import { getLedgerList } from "/@/api/equipment/ledger";
 import { getPlanList } from "/@/api/equipment/chenkPlan";
 import { useI18n } from "/@/hooks/web/useI18n";
+import { useUserStore } from '/@/store/modules/user';
+import { BasicTable, useTable } from '/@/components/Table';
 
 const Options = ref([]);
 const planOptions = ref([]);
 const { t } = useI18n();
+const userStore = useUserStore();
 // 定义 props
 const props = defineProps({
   initialData: {
@@ -169,27 +216,89 @@ onMounted(() => {
   fetchAgeOptions();
 });
 
+const deviceVisible = ref(false);
+const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
+const selectedDevice = ref<any>(null);
+const activeDeviceRecord = ref<any>(null);
+
+const [registerDeviceTable, { reload: reloadDeviceTable }] = useTable({
+  api: getLedgerList,
+  columns: [
+    { title: '设备位号', dataIndex: 'code', width: 160 },
+    { title: '设备名称', dataIndex: 'name', width: 240 },
+  ],
+  searchInfo: deviceSearchInfo,
+  useSearchForm: false,
+  showTableSetting: false,
+  bordered: true,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  rowKey: 'id',
+  pagination: { pageSize: 10 },
+  rowSelection: {
+    type: 'radio',
+    onSelect: (record) => {
+      selectedDevice.value = record;
+    },
+    onSelectAll: () => {},
+  },
+});
+
 const fetchAgeOptions = async () => {
   try {
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'MAINTENANCE' }); // 调用接口
-    Options.value = response.items?.map((item: any) => {
-      return {
-        value: item?.id,
-        label: item?.name
-      }
-    })
-    planOptions.value = response1.items?.map((item: any) => {
-      return {
-        value: item?.id,
-        label: item?.name
-      }
-    });
+    Options.value = response.items || [];
+    planOptions.value = response1.items || [];
   } catch (error) {
     console.error('失败:', error);
   }
 };
 
+const handleCheckPlanChange = (checkPlanId: any, record: any) => {
+  const selected = planOptions.value?.find((item: any) => item?.id === checkPlanId);
+  record.preserveDetail = selected?.planDetails || '';
+};
+
+const getDeviceLabel = (record: any) => {
+  const code = record?.deviceCode;
+  const name = record?.deviceName;
+  if (code && name) return `${code} / ${name}`;
+  return name || code || '';
+};
+
+const goChooseDevice = (record: any) => {
+  activeDeviceRecord.value = record;
+  selectedDevice.value = null;
+  deviceVisible.value = true;
+  reloadDeviceTable();
+};
+
+const handleDeviceSearch = () => {
+  reloadDeviceTable();
+};
+
+const handleDeviceReset = () => {
+  deviceSearchInfo.code = '';
+  deviceSearchInfo.name = '';
+  reloadDeviceTable();
+};
+
+const handleDeviceOk = () => {
+  if (!selectedDevice.value?.id || !activeDeviceRecord.value) {
+    deviceVisible.value = false;
+    return;
+  }
+  activeDeviceRecord.value.deviceId = selectedDevice.value.id;
+  activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
+  activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  deviceVisible.value = false;
+};
+
+const handleDeviceCancel = () => {
+  deviceVisible.value = false;
+};
+
 // 监听 visible 的变化
 watch(
   () => props.visible,

@@ -70,11 +70,25 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-form-item label="保养明细" name="preserveDetailList">
+      <a-form-item label="保养明细" 
+      name="preserveDetailList"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 19 }"
+      >
         <a-table bordered :data-source="tableData" :columns="columns">
           <template #deviceInfo="{ record }">
             <div>
-              {{record?.deviceInfo.name}}
+              <template v-if="userInfo.isTargetTenant">
+                <div style="display: flex; gap: 8px">
+                  <a-input :value="getDeviceLabel(record)" :disabled="true" placeholder="请选择" />
+                  <a-button type="primary" @click="goChooseDevice(record)" :disabled="isViewMode">
+                    选设备
+                  </a-button>
+                </div>
+              </template>
+              <template v-else>
+                {{ record?.deviceInfo?.name }}
+              </template>
             </div>
           </template>
           <template #status="{ record }">
@@ -116,6 +130,34 @@
       </div>
     </a-modal>
   </a-modal>
+  <a-modal
+    v-model:visible="deviceVisible"
+    title="选择设备"
+    width="70vw"
+    height="60vh"
+    @ok="handleDeviceOk"
+    @cancel="handleDeviceCancel"
+  >
+    <div style="padding: 20px">
+      <div style="display: flex; gap: 12px; margin-bottom: 12px">
+        <a-input
+          v-model:value="deviceSearchInfo.code"
+          placeholder="设备位号"
+          allowClear
+          style="width: 240px"
+        />
+        <a-input
+          v-model:value="deviceSearchInfo.name"
+          placeholder="设备名称"
+          allowClear
+          style="width: 240px"
+        />
+        <a-button type="primary" @click="handleDeviceSearch">搜索</a-button>
+        <a-button @click="handleDeviceReset">重置</a-button>
+      </div>
+      <BasicTable @register="registerDeviceTable" />
+    </div>
+  </a-modal>
 </template>
 <script setup lang="ts">
 // 定义 props
@@ -126,6 +168,8 @@ import {getUserListByOrg} from "/@/api/equipment/ledger";
 import {useUserStore} from "/@/store/modules/user";
 import {serveRecordDetail} from "/@/api/inspection/serviceRecord";
 import {useMessage} from "/@/hooks/web/useMessage";
+import { BasicTable, useTable } from '/@/components/Table';
+import { getLedgerList } from '/@/api/equipment/ledger';
 const { createMessage } = useMessage();
 
 const searchInfo = reactive<Recordable>({});
@@ -191,6 +235,33 @@ const tableData = ref([...props.initialData.tableData]);
 const emit = defineEmits(['update:visible', 'submit']);
 const planOptions = ref([]);
 const Options = ref([]);
+const deviceVisible = ref(false);
+const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
+const selectedDevice = ref<any>(null);
+const activeDeviceRecord = ref<any>(null);
+
+const [registerDeviceTable, { reload: reloadDeviceTable }] = useTable({
+  api: getLedgerList,
+  columns: [
+    { title: '设备位号', dataIndex: 'code', width: 160 },
+    { title: '设备名称', dataIndex: 'name', width: 240 },
+  ],
+  searchInfo: deviceSearchInfo,
+  useSearchForm: false,
+  showTableSetting: false,
+  bordered: true,
+  showIndexColumn: false,
+  clickToRowSelect: false,
+  rowKey: 'id',
+  pagination: { pageSize: 10 },
+  rowSelection: {
+    type: 'radio',
+    onSelect: (record) => {
+      selectedDevice.value = record;
+    },
+    onSelectAll: () => {},
+  },
+});
 const rules = {
   recordCode: [
     { required: true, message: '请输入', trigger: 'blur' },
@@ -258,6 +329,9 @@ const handleChange = async (value: Value) => {
       preserveDetail: item?.preserveDetail || '',
       deviceInfo: item?.deviceInfo || {},
       preserveDetailId: item?.id || '',
+      deviceId: item?.deviceInfo?.id || item?.deviceId,
+      deviceCode: item?.deviceInfo?.code || item?.deviceCode,
+      deviceName: item?.deviceInfo?.name || item?.deviceName,
       status: 'UNEXECUTED'
     }
   }) || []
@@ -304,6 +378,51 @@ const fetchAgeOptions = async () => {
   }
 };
 
+const getDeviceLabel = (record: any) => {
+  const code = record?.deviceCode;
+  const name = record?.deviceName;
+  if (code && name) return `${code} / ${name}`;
+  return name || code || '';
+};
+
+const goChooseDevice = (record: any) => {
+  activeDeviceRecord.value = record;
+  selectedDevice.value = null;
+  deviceVisible.value = true;
+  reloadDeviceTable();
+};
+
+const handleDeviceSearch = () => {
+  reloadDeviceTable();
+};
+
+const handleDeviceReset = () => {
+  deviceSearchInfo.code = '';
+  deviceSearchInfo.name = '';
+  reloadDeviceTable();
+};
+
+const handleDeviceOk = () => {
+  if (!selectedDevice.value?.id || !activeDeviceRecord.value) {
+    deviceVisible.value = false;
+    return;
+  }
+  activeDeviceRecord.value.deviceId = selectedDevice.value.id;
+  activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
+  activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  activeDeviceRecord.value.deviceInfo = {
+    ...(activeDeviceRecord.value.deviceInfo || {}),
+    id: selectedDevice.value.id,
+    code: selectedDevice.value.code,
+    name: selectedDevice.value.name,
+  };
+  deviceVisible.value = false;
+};
+
+const handleDeviceCancel = () => {
+  deviceVisible.value = false;
+};
+
 const handleOk = () => {
   if (isViewMode.value) {
     visible.value = false;

@@ -2,61 +2,76 @@ import { FormSchema } from '/@/components/Form';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { BasicColumn } from '/@/components/Table';
 import {getRepairOrderList} from "../../../api/repair/order";
+import { useUserStore } from '/@/store/modules/user';
 const { t } = useI18n();
 
-export const columns: BasicColumn[] = [
-  {
-    title: t('repair.history.photo'),
-    dataIndex: 'situationImg',
-    slots: { customRender: 'situationImg' },
-  },
-  {
-    title: t('repair.history.orderCode'),
-    dataIndex: 'code',
-  },
-  {
-    title: t('repair.history.orderText'),
-    dataIndex: 'orderCode',
-    format: (text, record) => {
-      return record.tkRepairOrderDTO?.orderCode || '-' || text;
+export function getColumns() {
+  const userStore = useUserStore();
+  const cols: BasicColumn[] = [
+    {
+      title: t('repair.history.photo'),
+      dataIndex: 'situationImg',
+      slots: { customRender: 'situationImg' },
     },
-  },
-  {
-    title: t('repair.history.deviceNameText'),
-    dataIndex: 'deviceAccountName',
-  },
-  {
-    title: t('repair.history.time'),
-    dataIndex: 'reportDate',
-    format: (text, record) => {
-      return record.tkRepairOrderDTO?.reportDate || '-' || text;
+    {
+      title: t('repair.history.orderCode'),
+      dataIndex: 'code',
     },
-  },
-  {
-    title: t('repair.history.reportByName'),
-    dataIndex: 'tkRepairOrderDTO',
-    format: (text, record) => {
-      return record.tkRepairOrderDTO?.reportByName || '-' || text;
+    {
+      title: t('repair.history.orderText'),
+      dataIndex: 'orderCode',
+      format: (text, record) => {
+        return record.tkRepairOrderDTO?.orderCode || '-' || text;
+      },
     },
-  },
+    {
+      title: t('repair.history.deviceNameText'),
+      dataIndex: 'deviceAccountName',
+    },
+    {
+      title: t('repair.history.time'),
+      dataIndex: 'reportDate',
+      format: (text, record) => {
+        return record.tkRepairOrderDTO?.reportDate || '-' || text;
+      },
+    },
+    {
+      title: t('repair.history.reportByName'),
+      dataIndex: 'tkRepairOrderDTO',
+      format: (text, record) => {
+        return record.tkRepairOrderDTO?.reportByName || '-' || text;
+      },
+    },
+    {
+      title: t('repair.history.description'),
+      dataIndex: 'description',
+    },
+    {
+      title: t('repair.history.repairTime'),
+      dataIndex: 'repairDate',
+    },
+    {
+      title: t('repair.history.repairByName'),
+      dataIndex: 'repairName',
+    },
+    {
+      title: t('repair.history.repairReason'),
+      dataIndex: 'malfunctionReasonName',
+    },
+  ];
 
-  {
-    title: t('repair.history.description'),
-    dataIndex: 'description',
-  },
-  {
-    title: t('repair.history.repairTime'),
-    dataIndex: 'repairDate',
-  },
-  {
-    title: t('repair.history.repairByName'),
-    dataIndex: 'repairName',
-  },
-  {
-    title: t('repair.history.repairReason'),
-    dataIndex: 'malfunctionReasonName',
-  },
-];
+  if (userStore.isTargetTenant) {
+    const deviceNameIndex = cols.findIndex((c) => c.dataIndex === 'deviceAccountName');
+    if (deviceNameIndex !== -1) {
+      cols.splice(deviceNameIndex, 0, {
+        title: '设备位号',
+        dataIndex: 'deviceAccountCode',
+      });
+    }
+  }
+
+  return cols;
+}
 
 export const searchFormSchema: FormSchema[] = [
   {

@@ -19,7 +19,7 @@
 <script setup lang="ts">
   import { BasicTable, useTable, TableImg } from '/@/components/Table';
   import { getRepairHistoryList } from '/@/api/repair/history';
-  import { columns, searchFormSchema } from "./index"
+  import { getColumns, searchFormSchema } from "./index"
   import { useI18n } from '/@/hooks/web/useI18n';
   const { t } = useI18n();
   const [
@@ -28,7 +28,7 @@
   ] = useTable({
     title: t('repair.history.listText'),
     api: getRepairHistoryList,
-    columns,
+    columns: getColumns(),
     formConfig: {
       labelWidth: 100,
       schemas: searchFormSchema,

@@ -11,8 +11,24 @@
     >
       <div>
         <BasicForm @register="registerForm" />
+        <div
+          v-if="userInfo.isTargetTenant"
+          style="display: flex; width: 70%; margin-left: 70px; margin-bottom: 18px"
+        >
+          <div
+            style="display: flex; width: 130px; align-content: center; justify-content: center"
+            class="inputTitle"
+          >
+            设备
+          </div>
+          <a-input placeholder="请选择" :disabled="true" v-model:value="selectedDeviceLabel" />
+          <a-button type="primary" @click="goChooseDevice">选设备</a-button>
+        </div>
         <div style="display: flex; width: 70%; margin-left: 70px">
-          <div style="display: flex;width: 115px;align-content: center;justify-content: center;" class="inputTitle">
+          <div
+            style="display: flex; width: 118px; align-content: center; justify-content: center"
+            class="inputTitle"
+          >
             报修人
           </div>
           <a-input placeholder="请选择" :disabled="true" v-model:value="selectedUsername" />
@@ -38,6 +54,34 @@
           </div>
         </div>
       </a-modal>
+      <a-modal
+        v-model:visible="deviceVisible"
+        title="选择设备"
+        width="70vw"
+        height="40vh"
+        @ok="handleDeviceOk"
+        @cancel="handleDeviceCancel"
+      >
+        <div style="padding: 20px">
+          <div style="display: flex; gap: 12px; margin-bottom: 12px">
+            <a-input
+              v-model:value="deviceSearchInfo.code"
+              placeholder="请输入设备位号"
+              allowClear
+              style="width: 240px"
+            />
+            <a-input
+              v-model:value="deviceSearchInfo.name"
+              placeholder="请输入设备名称"
+              allowClear
+              style="width: 240px"
+            />
+            <a-button type="primary" @click="handleDeviceSearch">搜索</a-button>
+            <a-button @click="handleDeviceReset">重置</a-button>
+          </div>
+          <BasicTable @register="registerDeviceTable" />
+        </div>
+      </a-modal>
     </BasicModal>
   </div>
 </template>
@@ -52,6 +96,8 @@
   import { saveOrder } from '/@/api/repair/order';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { getLedgerList } from '/@/api/equipment/ledger';
   const { t } = useI18n();
   const isUpdate = ref<Boolean>(false);
   const recordInfo = ref<any>({});
@@ -66,6 +112,9 @@
   const userVisible = ref(false);
   const userModalTitle = ref('选人');
   const selectedItem = ref<{ id: string; username: string } | null>(null);
+  const deviceVisible = ref(false);
+  const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
+  const selectedDevice = ref<any>(null);
   const radioStyle = reactive({
     display: 'block',
     height: '30px',
@@ -81,6 +130,16 @@
     },
   });
 
+  const selectedDeviceLabel = computed({
+    get: () => {
+      const code = selectedDevice.value?.code;
+      const name = selectedDevice.value?.name;
+      if (code && name) return `${code} / ${name}`;
+      return name || code || '';
+    },
+    set: () => {},
+  });
+
   const emit = defineEmits(['handleReload', 'register']);
 
   const getTitle = computed(() =>
@@ -96,6 +155,29 @@
     showActionButtonGroup: false,
   });
 
+  const [registerDeviceTable, { reload: reloadDeviceTable }] = useTable({
+    api: getLedgerList,
+    columns: [
+      { title: '设备位号', dataIndex: 'code', width: 160 },
+      { title: '设备名称', dataIndex: 'name', width: 240 },
+    ],
+    searchInfo: deviceSearchInfo,
+    useSearchForm: false,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    rowKey: 'id',
+    pagination: { pageSize: 10 },
+    rowSelection: {
+      type: 'radio',
+      onSelect: (record) => {
+        selectedDevice.value = record;
+      },
+      onSelectAll: () => {},
+    },
+  });
+
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
     setModalProps({ confirmLoading: false, loading: true });
     isUpdate.value = data?.isUpdate;
@@ -111,6 +193,27 @@
         onChange: handleOrgChange,
       },
     });
+    if (userInfo.isTargetTenant) {
+      updateSchema({
+        field: 'deviceId',
+        ifShow: false,
+      });
+      selectedDevice.value = data?.record?.deviceInfo
+        ? {
+            id: data?.record?.deviceId,
+            name: data?.record?.deviceInfo?.name,
+            code: data?.record?.deviceInfo?.code,
+          }
+        : data?.record?.deviceId
+        ? { id: data?.record?.deviceId, name: '' }
+        : null;
+    } else {
+      updateSchema({
+        field: 'deviceId',
+        ifShow: true,
+      });
+      selectedDevice.value = null;
+    }
     if (data?.record) {
       setFieldsValue(data?.record);
     }
@@ -154,6 +257,10 @@
   const handleOk = async () => {
     await validate();
     let values = getFieldsValue();
+    if (userInfo.isTargetTenant && !selectedDevice.value?.id) {
+      createMessage.warning('请选择设备');
+      return;
+    }
     if (!selectedItem?.value?.id) {
       createMessage.warning('请选择报修人');
       return;
@@ -172,6 +279,9 @@
         reportBy: selectedItem.value?.id || '',
       };
     }
+    if (userInfo.isTargetTenant) {
+      values = { ...values, deviceId: selectedDevice.value?.id };
+    }
     await saveOrder(values);
     createMessage.success(t('common.operationSuccessText'));
     emit('handleReload');
@@ -183,6 +293,34 @@
     selectedItem.value = null;
   };
 
+  const goChooseDevice = () => {
+    deviceVisible.value = true;
+    reloadDeviceTable();
+  };
+
+  const handleDeviceSearch = () => {
+    reloadDeviceTable();
+  };
+
+  const handleDeviceReset = () => {
+    deviceSearchInfo.code = '';
+    deviceSearchInfo.name = '';
+    reloadDeviceTable();
+  };
+
+  const handleDeviceOk = async () => {
+    if (!selectedDevice.value?.id) {
+      createMessage.warning('请选择设备');
+      return;
+    }
+    await setFieldsValue({ deviceId: selectedDevice.value.id });
+    deviceVisible.value = false;
+  };
+
+  const handleDeviceCancel = () => {
+    deviceVisible.value = false;
+  };
+
   // 确认按钮的回调
   const handleUserOk = () => {
     if (!selectedItem.value) {

@@ -19,72 +19,112 @@ const emergencyOptions = [
   { label: '否', value: false },
 ];
 
-export const columns: BasicColumn[] = [
-  {
-    title: t('repair.order.situationImg'),
-    dataIndex: 'situationImg',
-    slots: { customRender: 'situationImg' },
-  },
-  {
-    title: t('repair.order.nameCode'),
-    dataIndex: 'orderCode',
-  },
-  {
-    title: t('repair.order.deviceNameText'),
-    dataIndex: 'deviceId',
-    slots: { customRender: 'deviceId' },
-  },
-  {
-    title: t('repair.order.reportDateText'),
-    dataIndex: 'reportDate',
-  },
-  {
-    title: t('repair.order.reportByName'),
-    dataIndex: 'reportByName',
-  },
-  {
-    title: t('repair.order.description'),
-    dataIndex: 'description',
-  },
-  {
-    title: t('repair.order.statusText'),
-    dataIndex: 'status',
-    slots: { customRender: 'status' },
-  },
-  {
-    title: t('repair.order.emergencyText'),
-    dataIndex: 'emergency',
-    slots: { customRender: 'emergency' },
-  },
-];
+export function getColumns(isTargetTenant: boolean): BasicColumn[] {
+  const cols: BasicColumn[] = [
+    {
+      title: t('repair.order.situationImg'),
+      dataIndex: 'situationImg',
+      slots: { customRender: 'situationImg' },
+    },
+    {
+      title: t('repair.order.nameCode'),
+      dataIndex: 'orderCode',
+    },
+    {
+      title: t('repair.order.deviceNameText'),
+      dataIndex: 'deviceId',
+      slots: { customRender: 'deviceId' },
+    },
+    {
+      title: t('repair.order.reportDateText'),
+      dataIndex: 'reportDate',
+    },
+    {
+      title: t('repair.order.reportByName'),
+      dataIndex: 'reportByName',
+    },
+    {
+      title: t('repair.order.description'),
+      dataIndex: 'description',
+    },
+    {
+      title: t('repair.order.statusText'),
+      dataIndex: 'status',
+      slots: { customRender: 'status' },
+    },
+    {
+      title: t('repair.order.emergencyText'),
+      dataIndex: 'emergency',
+      slots: { customRender: 'emergency' },
+    },
+  ];
 
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'deviceId',
-    label: t('repair.order.deviceNameText'),
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: {
-      api: getLedgerList,
-      params: {
-        page: 1,
-        pageSize: 999,
+  if (isTargetTenant) {
+    const deviceIndex = cols.findIndex((c) => c.dataIndex === 'deviceId');
+    if (deviceIndex !== -1) {
+      cols.splice(deviceIndex, 0, {
+        title: '设备位号',
+        dataIndex: 'deviceCode',
+        slots: { customRender: 'deviceCode' },
+      });
+    }
+  }
+
+  return cols;
+}
+
+export function getSearchFormSchema(isTargetTenant: boolean): FormSchema[] {
+  const schema: FormSchema[] = [
+    {
+      field: 'deviceId',
+      label: t('repair.order.deviceNameText'),
+      component: 'ApiSelect',
+      colProps: { span: 6 },
+      ifShow: !isTargetTenant,
+      componentProps: {
+        api: getLedgerList,
+        params: {
+          page: 1,
+          pageSize: 999,
+        },
+        resultField: 'items',
+        labelField: 'name',
+        valueField: 'id',
       },
-      resultField: 'items',
-      labelField: 'name',
-      valueField: 'id',
     },
-  },
-  {
-    field: 'status',
-    label: t('repair.order.statusText'),
-    component: 'Select',
-    colProps: { span: 6 },
-    componentProps: {
-      options: statusOptions,
+    {
+      field: 'deviceCode',
+      label: '设备位号',
+      component: 'Input',
+      colProps: { span: 6 },
+      ifShow: isTargetTenant,
+      componentProps: {
+        maxLength: 255,
+      },
     },
-  },
-];
+    {
+      field: 'deviceName',
+      label: t('repair.order.deviceNameText'),
+      component: 'Input',
+      colProps: { span: 6 },
+      ifShow: isTargetTenant,
+      componentProps: {
+        maxLength: 255,
+      },
+    },
+    {
+      field: 'status',
+      label: t('repair.order.statusText'),
+      component: 'Select',
+      colProps: { span: 6 },
+      componentProps: {
+        options: statusOptions,
+      },
+    },
+  ];
+
+  return schema;
+}
 
 export const schemas: FormSchema[] = [
   {

@@ -23,6 +23,9 @@
       <template #deviceId="{ record }">
         <span>{{ record?.deviceInfo?.name }}</span>
       </template>
+      <template #deviceCode="{ record }">
+        <span>{{ record?.deviceInfo?.code }}</span>
+      </template>
       <template #status="{ record }">
         <Tag
           :color="
@@ -86,11 +89,12 @@
   import { BasicTable, TableAction, TableImg } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
   import {getRepairOrderList, saveRecord, updateStatus} from '/@/api/repair/order';
-  import { columns, searchFormSchema } from './index';
+  import { getColumns, getSearchFormSchema } from './index';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { Button, Tag } from 'ant-design-vue';
   import { Authority } from '/@/components/Authority';
   import {useModal} from "/@/components/Modal";
+  import { useUserStore } from '/@/store/modules/user';
   const { t } = useI18n();
   const [registerModal, { openModal }] = useModal();
   import {FormDrawer} from "./components/FormDrawer/index";
@@ -101,6 +105,7 @@
   const modalVisible = ref(false);
   const [registerApplicationApiFormDrawer, {  }] = useDrawer();
   const { createMessage } = useMessage();
+  const userStore = useUserStore();
   const initialData = ref({
     form: {
       orderId:'',
@@ -117,10 +122,10 @@
   ] = useTable({
     title: t('repair.order.listText'),
     api: getRepairOrderList,
-    columns,
+    columns: getColumns(userStore.isTargetTenant),
     formConfig: {
       labelWidth: 100,
-      schemas: searchFormSchema,
+      schemas: getSearchFormSchema(userStore.isTargetTenant),
     },
     immediate: true,
     useSearchForm: true,