From 4b755f2cba368c71353c8f9f72811e509a806f17 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Thu, 20 Mar 2025 17:27:36 +0800
Subject: [PATCH] =?UTF-8?q?SBBJ-897=E8=AE=BE=E5=A4=87=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E9=A1=B9=E3=80=81=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E9=A1=B9=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=8C=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=90=8C=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=8E=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceMaintenance.data.ts                 | 51 ++++++++++++++++++
 .../eam/basic/inspection/inspection.data.ts   | 53 +++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index f0bf5d6..8c22715 100644
--- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -1,6 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
+import { selectAllFactoryAreaDept } from '@/api/system/dept'
+const factoryDeptList = await selectAllFactoryAreaDept()
 
 // 表单校验
 export const DeviceMaintenanceRules = reactive({
@@ -186,6 +188,55 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '所属厂区',
+    field: 'factoryAreaNumber',
+    sort: 'custom',
+    isSearch: false,
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => factoryDeptList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return factoryDeptList.find((account) => account.id == cellValue)?.name
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryDeptList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => factoryDeptList,
+      componentProps: {
+        disabled: false,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请选择所属厂区"
+      },
+    }
+  },
+  {
+    label: '所属厂区',
+    field: 'factoryAreaNumberDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+  },
   // {
   //   label: '是否可用',
   //   field: 'available',
diff --git a/src/views/eam/basic/inspection/inspection.data.ts b/src/views/eam/basic/inspection/inspection.data.ts
index 5176616..17e9819 100644
--- a/src/views/eam/basic/inspection/inspection.data.ts
+++ b/src/views/eam/basic/inspection/inspection.data.ts
@@ -2,6 +2,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 
+import { selectAllFactoryAreaDept } from '@/api/system/dept'
+const factoryDeptList = await selectAllFactoryAreaDept()
+
+
 // 表单校验
 export const DeviceMoldItemsRules = reactive({
   name: [required],
@@ -157,6 +161,55 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       value: false,
     }
   },
+  {
+    label: '所属厂区',
+    field: 'factoryAreaNumber',
+    sort: 'custom',
+    isSearch: false,
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => factoryDeptList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return factoryDeptList.find((account) => account.id == cellValue)?.name
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryDeptList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => factoryDeptList,
+      componentProps: {
+        disabled: false,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请选择所属厂区"
+      },
+    }
+  },
+  {
+    label: '所属厂区',
+    field: 'factoryAreaNumberDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+  },
   // {
   //   label: '是否可用',
   //   field: 'available',