From 681a0086b14fd0907a122c7458ae1b3630a6006c Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Wed, 31 Jan 2024 14:59:28 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/basic/deviceMaintenance/index.ts  |  56 +++++
 .../index.ts                                  |   4 +-
 src/utils/dict.ts                             |   5 +-
 .../deviceMaintenance.data.ts}                |  42 +++-
 .../eam/basic/deviceMaintenance/index.vue     | 221 ++++++++++++++++++
 .../basic/inspection/deviceMoldItems.data.ts  |   2 +-
 src/views/eam/basic/inspection/index.vue      |   2 +-
 src/views/eam/basic/item/index.vue            |   2 +-
 src/views/eam/basic/item/item.data.ts         |  30 ++-
 .../index.vue                                 |  34 +--
 .../moldMaintenance/moldMaintenance.data.ts   | 147 ++++++++++++
 .../item/itemAccounts/itemAccounts.data.ts    | 168 ++++++++++++-
 .../eam/item/transaction/transaction.data.ts  |   1 -
 13 files changed, 667 insertions(+), 47 deletions(-)
 create mode 100644 src/api/eam/basic/deviceMaintenance/index.ts
 rename src/api/eam/basic/{deviceMoldItems => moldMaintenance}/index.ts (98%)
 rename src/views/eam/basic/{maintenance/deviceMoldItems.data.ts => deviceMaintenance/deviceMaintenance.data.ts} (77%)
 create mode 100644 src/views/eam/basic/deviceMaintenance/index.vue
 rename src/views/eam/basic/{maintenance => moldMaintenance}/index.vue (83%)
 create mode 100644 src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

diff --git a/src/api/eam/basic/deviceMaintenance/index.ts b/src/api/eam/basic/deviceMaintenance/index.ts
new file mode 100644
index 0000000..1fac84d
--- /dev/null
+++ b/src/api/eam/basic/deviceMaintenance/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface DeviceMoldItemsVO {
+  name: string
+  deviceNumber: string
+  type: "DEVICE"
+  status: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询项记录表（设备 模具 保养 维修 巡检点检）列表
+export const getDeviceMoldItemsPage = async (params) => {
+  params.type="DEVICE"
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/device-mold-items/senior', data })
+  } else {
+    return await request.get({ url: `/eam/device-mold-items/page`, params })
+  }
+}
+
+
+// 查询项记录表（设备 模具 保养 维修 巡检点检）详情
+export const getDeviceMoldItems = async (id: number) => {
+  return await request.get({ url: `/eam/device-mold-items/get?id=` + id })
+}
+
+// 查询供应商发票申请主详情
+export const getNumber = async (params) => {
+  return await request.get({ url: `/eam/device-mold-items/getNumber`, params})
+}
+
+// 新增项记录表（设备 模具 保养 维修 巡检点检）
+export const createDeviceMoldItems = async (data: DeviceMoldItemsVO) => {
+  return await request.post({ url: `/eam/device-mold-items/create`, data })
+}
+
+// 修改项记录表（设备 模具 保养 维修 巡检点检）
+export const updateDeviceMoldItems = async (data: DeviceMoldItemsVO) => {
+  return await request.put({ url: `/eam/device-mold-items/update`, data })
+}
+
+// 删除项记录表（设备 模具 保养 维修 巡检点检）
+export const deleteDeviceMoldItems = async (id: number) => {
+  return await request.delete({ url: `/eam/device-mold-items/delete?id=` + id })
+}
+
+// 导出项记录表（设备 模具 保养 维修 巡检点检） Excel
+export const exportDeviceMoldItems = async (params) => {
+  return await request.download({ url: `/eam/device-mold-items/export-excel`, params })
+}
+
+
diff --git a/src/api/eam/basic/deviceMoldItems/index.ts b/src/api/eam/basic/moldMaintenance/index.ts
similarity index 98%
rename from src/api/eam/basic/deviceMoldItems/index.ts
rename to src/api/eam/basic/moldMaintenance/index.ts
index dbe9e9c..4081838 100644
--- a/src/api/eam/basic/deviceMoldItems/index.ts
+++ b/src/api/eam/basic/moldMaintenance/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface DeviceMoldItemsVO {
   name: string
   deviceNumber: string
-  type: string
+  type: "MOLD"
   status: string
   siteId: string
   available: string
@@ -12,6 +12,7 @@ export interface DeviceMoldItemsVO {
 
 // 查询项记录表（设备 模具 保养 维修 巡检点检）列表
 export const getDeviceMoldItemsPage = async (params) => {
+  params.type="MOLD"
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -21,6 +22,7 @@ export const getDeviceMoldItemsPage = async (params) => {
   }
 }
 
+
 // 查询项记录表（设备 模具 保养 维修 巡检点检）详情
 export const getDeviceMoldItems = async (id: number) => {
   return await request.get({ url: `/eam/device-mold-items/get?id=` + id })
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 12ecc79..736e193 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -280,5 +280,6 @@ export enum DICT_TYPE {
   WEI_XIU_ORDER_STATUS = 'wei_xiu_order_status',//维修单状态
   BASIC_STATUS = 'basic_status',//设备模具状态
   CLASS_TYPE = 'class_type', // 班组类型
-  INVENTORY_ACTION = 'inventory_action'  //库存动作
-}
+  INVENTORY_ACTION = 'inventory_action',  //库存动作
+  MAINTENANCE_TYPE = 'maintenance_type',  //保养类型
+}
\ No newline at end of file
diff --git a/src/views/eam/basic/maintenance/deviceMoldItems.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
similarity index 77%
rename from src/views/eam/basic/maintenance/deviceMoldItems.data.ts
rename to src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index 945ecd0..e7fef3c 100644
--- a/src/views/eam/basic/maintenance/deviceMoldItems.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -1,9 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 
 // 表单校验
-export const DeviceMoldItemsRules = reactive({
+export const DeviceMaintenanceRules = reactive({
   name: [required],
   deviceNumber: [required],
   type: [required],
@@ -35,7 +35,7 @@ export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
 
 ]))
 
-export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
+export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '保养项名称',
     field: 'name',
@@ -48,16 +48,19 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
-      component: 'Select'
-    },
+      value: 'DEVICE',
+      componentProps: {
+        disabled: true,
+      }
+    }
   },
   {
-    label: '设备/模具编号',
+    label: '设备编号',
     field: 'deviceNumber',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -74,8 +77,8 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
             isMainValue: false
           }, {
             key: 'type',
-            value: 'type',
-            isMainValue: true
+            value: "DEVICE",
+            isMainValue: false
           }
         ]
       }
@@ -87,7 +90,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.DEVICEMOLDITEMS_STATUS,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Select',
       value: 'MAINTAIN',
@@ -96,12 +99,27 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '保养类型',
+    field: 'maintenanceType',
+    dictType: DICT_TYPE.MAINTENANCE_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: false,
+   form: {
+     component: 'Select',
+     value: 'CYCLE',
+     componentProps: {
+       disabled: true
+     }
+   },
+  },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/eam/basic/deviceMaintenance/index.vue b/src/views/eam/basic/deviceMaintenance/index.vue
new file mode 100644
index 0000000..f4d5926
--- /dev/null
+++ b/src/views/eam/basic/deviceMaintenance/index.vue
@@ -0,0 +1,221 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeviceMaintenance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeviceMaintenance.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="DeviceMaintenanceRules"
+    :formAllSchemas="DeviceMaintenance.allSchemas"
+    :apiUpdate="DeviceMaintenanceApi.updateDeviceMoldItems"
+    :apiCreate="DeviceMaintenanceApi.createDeviceMoldItems"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMaintenance.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DeviceMaintenance,DeviceMaintenanceRules } from './deviceMaintenance.data'
+import * as DeviceMaintenanceApi from '@/api/eam/basic/deviceMaintenance'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'DeviceMaintenance' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DeviceMaintenance.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeviceMaintenanceApi.getDeviceMoldItemsPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+   defaultButtons.mainListEditBtn(null), // 编辑
+    defaultButtons.mainListDeleteBtn(null), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =DeviceMaintenance.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await DeviceMaintenanceApi.createDeviceMoldItems(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await DeviceMaintenanceApi.updateDeviceMoldItems(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicDeviceMoldItems')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeviceMaintenanceApi.deleteDeviceMoldItems(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeviceMaintenanceApi.exportDeviceMoldItems(tableObject.params)
+    download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/eam/basic/inspection/deviceMoldItems.data.ts b/src/views/eam/basic/inspection/deviceMoldItems.data.ts
index 8bd6e80..6d41074 100644
--- a/src/views/eam/basic/inspection/deviceMoldItems.data.ts
+++ b/src/views/eam/basic/inspection/deviceMoldItems.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 
 // 表单校验
 export const DeviceMoldItemsRules = reactive({
diff --git a/src/views/eam/basic/inspection/index.vue b/src/views/eam/basic/inspection/index.vue
index c557c77..fdf55b1 100644
--- a/src/views/eam/basic/inspection/index.vue
+++ b/src/views/eam/basic/inspection/index.vue
@@ -58,7 +58,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { DeviceMoldItems,DeviceMoldItemsRules } from './deviceMoldItems.data'
-import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue
index d3d9eb3..372b250 100644
--- a/src/views/eam/basic/item/index.vue
+++ b/src/views/eam/basic/item/index.vue
@@ -98,7 +98,7 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    defaultButtons.defaultAddBtn(null), // 新增
+    // defaultButtons.defaultAddBtn(null), // 新增
     defaultButtons.defaultExportBtn(null), // 导出
 
     defaultButtons.defaultFreshBtn(null), // 刷新
diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts
index c47549e..dd78d93 100644
--- a/src/views/eam/basic/item/item.data.ts
+++ b/src/views/eam/basic/item/item.data.ts
@@ -25,6 +25,9 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width:110,
+    },
   },
   {
     label: '规格',
@@ -36,11 +39,11 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isConstant',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width:110,
     },
     tableForm: {
       type: 'Select',
@@ -67,11 +70,8 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
-    table: {
-      width: 150
-    },
     tableForm: {
       type: 'Select'
     }
@@ -85,6 +85,9 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: '重点采购',
     field: 'reprocurement',
     sort: 'custom',
+    table: {
+      width:110,
+    },
     form: {
       component: 'InputNumber',
       value: 0
@@ -94,6 +97,9 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: '安全库存',
     field: 'safetyStock',
     sort: 'custom',
+    table: {
+      width:110,
+    },
     form: {
       component: 'InputNumber',
       value: 0
@@ -103,11 +109,17 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     label: '成本中心',
     field: 'cost',
     sort: 'custom',
+    table: {
+      width:110,
+    },  
   },
   {
     label: '采购员',
     field: 'purchaser',
     sort: 'custom',
+    table: {
+      width:100,
+    },
   },
   {
     label: '财务',
@@ -119,11 +131,11 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isRadeIn',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 140
     },
     tableForm: {
       type: 'Select',
@@ -144,7 +156,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/eam/basic/maintenance/index.vue b/src/views/eam/basic/moldMaintenance/index.vue
similarity index 83%
rename from src/views/eam/basic/maintenance/index.vue
rename to src/views/eam/basic/moldMaintenance/index.vue
index 531dd8b..8a7f6c6 100644
--- a/src/views/eam/basic/maintenance/index.vue
+++ b/src/views/eam/basic/moldMaintenance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DeviceMoldItems.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="MoldMaintenance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="DeviceMoldItems.allSchemas"
+      :allSchemas="MoldMaintenance.allSchemas"
     />
 
   <!-- 列表 -->
@@ -42,35 +42,35 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :rules="DeviceMoldItemsRules"
-    :formAllSchemas="DeviceMoldItems.allSchemas"
-    :apiUpdate="DeviceMoldItemsApi.updateDeviceMoldItems"
-    :apiCreate="DeviceMoldItemsApi.createDeviceMoldItems"
+    :rules="MoldMaintenanceRules"
+    :formAllSchemas="MoldMaintenance.allSchemas"
+    :apiUpdate="MoldMaintenanceApi.updateDeviceMoldItems"
+    :apiCreate="MoldMaintenanceApi.createDeviceMoldItems"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMoldItems.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="MoldMaintenance.allSchemas" />
 
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { DeviceMoldItems,DeviceMoldItemsRules } from './deviceMoldItems.data'
-import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMoldItems'
+import { MoldMaintenance,MoldMaintenanceRules } from './moldMaintenance.data'
+import * as MoldMaintenanceApi from '@/api/eam/basic/moldMaintenance'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
-defineOptions({ name: 'Maintenance' })
+defineOptions({ name: 'MoldMaintenance' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(DeviceMoldItems.allSchemas.tableColumns)
+const tableColumns = ref(MoldMaintenance.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -87,7 +87,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: DeviceMoldItemsApi.getDeviceMoldItemsPage // 分页接口
+  getListApi: MoldMaintenanceApi.getDeviceMoldItemsPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =DeviceMoldItems.allSchemas.formSchema.some(function (item) {
+  var isHave =MoldMaintenance.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
   if(isHave){
@@ -159,10 +159,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await DeviceMoldItemsApi.createDeviceMoldItems(data)
+    await MoldMaintenanceApi.createDeviceMoldItems(data)
     message.success(t('common.createSuccess'))
   } else {
-    await DeviceMoldItemsApi.updateDeviceMoldItems(data)
+    await MoldMaintenanceApi.updateDeviceMoldItems(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -181,7 +181,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await DeviceMoldItemsApi.deleteDeviceMoldItems(id)
+    await MoldMaintenanceApi.deleteDeviceMoldItems(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -196,7 +196,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DeviceMoldItemsApi.exportDeviceMoldItems(tableObject.params)
+    const data = await MoldMaintenanceApi.exportDeviceMoldItems(tableObject.params)
     download.excel(data, '项记录表（设备 模具 保养 维修 巡检点检）.xlsx')
   } catch {
   } finally {
diff --git a/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
new file mode 100644
index 0000000..4a7967a
--- /dev/null
+++ b/src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts
@@ -0,0 +1,147 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
+
+// 表单校验
+export const MoldMaintenanceRules = reactive({
+  name: [required],
+  deviceNumber: [required],
+  type: [required],
+  status: [required],
+  concurrencyStamp: [required],
+})
+
+export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '规格型号',
+    field: 'specification',
+    sort: 'custom',
+  },
+
+]))
+
+export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '保养项名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+ {
+   label: '类型',
+   field: 'type',
+   dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
+   dictClass: 'string',
+   sort: 'custom',
+   isSearch: false,
+   form: {
+     value: 'MOLD',
+     componentProps: {
+       disabled: true,
+     }
+   }
+ },
+  {
+    label: '模具编号',
+    field: 'deviceNumber',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择模具编号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '模具信息', // 查询弹窗标题
+        searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
+        searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }, {
+            key: 'type',
+            value: "MOLD",
+            isMainValue: false
+          }
+        ]
+      }
+    }
+  },
+  {
+    label: '项类型',
+    field: 'status',
+    dictType: DICT_TYPE.DEVICEMOLDITEMS_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Select',
+      value: 'MAINTAIN',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '保养类型',
+    field: 'maintenanceType',
+    dictType: DICT_TYPE.MAINTENANCE_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: false,
+   form: {
+     component: 'Select'
+   },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
index 255a32a..90324f4 100644
--- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
@@ -14,21 +14,185 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
   },
   {
-    label: '库存数量',
-    field: 'qty',
+    label: '备件名称',
+    field: 'itemDO.name',
+    sort: 'custom',
+    table: {
+      width: 110
+    },
+    isSearch: true,
+  },
+
+  {
+    label: '库位编号',
+    field: 'locationNumber',
     sort: 'custom',
+    table: {
+      width: 110
+    },
   },
   {
     label: '库区编号',
     field: 'areaNumber',
     sort: 'custom',
+    table: {
+      width: 110
+    },
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 110
+    },
   },
   {
     label: '是否账内库',
     field: 'isInAccount',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 130
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+
+
+
+  {
+    label: '规格',
+    field: 'itemDO.specifications',
+    sort: 'custom',
+  },
+  {
+    label: '是否存储',
+    field: 'itemDO.isConstant',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 110
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '科目',
+    field: 'itemDO.subject',
+    sort: 'custom',
+  },
+  {
+    label: '单位',
+    field: 'itemDO.uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '单价',
+    field: 'itemDO.singlePrice',
+    sort: 'custom',
+  },
+  {
+    label: '重点采购',
+    field: 'itemDO.reprocurement',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '安全库存',
+    field: 'itemDO.safetyStock',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '成本中心',
+    field: 'itemDO.cost',
+    sort: 'custom',
+  },
+  {
+    label: '采购员',
+    field: 'itemDO.purchaser',
+    sort: 'custom',
+  },
+  {
+    label: '财务',
+    field: 'itemDO.financer',
+    sort: 'custom',
+  },
+  {
+    label: '是否以旧换新',
+    field: 'itemDO.isRadeIn',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '是否可用',
diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts
index 04054bf..1ee3eb2 100644
--- a/src/views/eam/item/transaction/transaction.data.ts
+++ b/src/views/eam/item/transaction/transaction.data.ts
@@ -10,7 +10,6 @@ export const Rules = reactive({
 })
 
 export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
-
   {
     label: '事务编号',
     field: 'number',