diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts
new file mode 100644
index 000000000..835e6bff0
--- /dev/null
+++ b/src/api/eam/equipmentMaintenanceMain/index.ts
@@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface EquipmentMaintenanceMainVO {
+  id: number
+  number: string
+  describing: string
+  equipmentCode: string
+  type: string
+  classes: string
+  planNumber: string
+  faultType: string
+  cycle: string
+  times: string
+  verifyer: number
+  verifyContent: string
+  verifyTime: Date
+  maintenancer: number
+  maintenancePhone: string
+  completeResult: string
+  completionTime: Date
+  maintenanceTime: Date
+  status: string
+  factoryAreaCode: string
+  workshopCode: string
+  workshopSectionCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询设备保养工单主列表
+export const getEquipmentMaintenanceMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/equipment-maintenance-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/equipment-maintenance-main/page`, params })
+  }
+}
+
+// 查询设备保养工单主详情
+export const getEquipmentMaintenanceMain = async (id: number) => {
+  return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id })
+}
+
+// 新增设备保养工单主
+export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/create`, data })
+}
+
+// 修改设备保养工单主
+export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.put({ url: `/eam/equipment-maintenance-main/update`, data })
+}
+
+// 删除设备保养工单主
+export const deleteEquipmentMaintenanceMain = async (id: number) => {
+  return await request.delete({ url: `/eam/equipment-maintenance-main/delete?id=` + id })
+}
+
+// 导出设备保养工单主 Excel
+export const exportEquipmentMaintenanceMain = async (params) => {
+  return await request.download({ url: `/eam/equipment-maintenance-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/equipment-maintenance-main/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 73363f566..8ceae3d64 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -153,7 +153,7 @@ const initSelectSta = () => {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
             _showTableColumns.push(_myTableColumns.find(myItem => (myItem.label == item.label)))
-            allData.value.push(t(`ts.${item.label}`))
+            allData.value.push(t(`ts.${item.label}`).replace('ts.',''))
           }
         }
       })
@@ -165,7 +165,7 @@ const initSelectSta = () => {
         if (!myTableItem.fixed) {
           if (myTableItem.field != 'action') {
             if (allData.value.indexOf(myTableItem.label) == -1) {
-              allData.value.push(t(`ts.${myTableItem.label}`))
+              allData.value.push(t(`ts.${myTableItem.label}`).replace('ts.',''))
             }
           }
         }
@@ -195,7 +195,7 @@ const initSelectSta = () => {
         if (!item.fixed) {
           if (item.field != 'action') {
             checkedDataList.value.push(item.label)
-            allData.value.push(t(`ts.${item.label}`))
+            allData.value.push(t(`ts.${item.label}`).replace('ts.',''))
           }
         }
       })
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 5a6b94b3f..d828c8d92 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1086,7 +1086,7 @@ export default {
     查看质检报告:'Check the quality inspection report',
     长春:'ChangChun',
     成都:'ChengDu',
-    富维海拉智慧工厂管理平台:'HELLR Smart Factory Management Platform',
+    富维海拉智慧工厂管理平台:'HELLA Smart Factory Management Platform',
     采购未收货记录:'Purchase unreceived record',
     请选择要货计划单号:'Please select the desired shipment tracking number',
     大小不超过:'Not more in size',
diff --git a/src/main.ts b/src/main.ts
index c8c5c34d5..50255e0c3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -74,7 +74,7 @@ const setupAll = async () => {
 // 多语言相关
 const localeStore = useLocaleStore()
 if(localeStore&&localeStore.currentLocale&&localeStore.currentLocale.lang.indexOf('en')>-1&&document.querySelector('#app-loading-title')){
-  document.querySelector('#app-loading-title').innerHTML = 'HELLR Smart Factory Management Platform' // 富维海拉智慧工厂管理平台
+  document.querySelector('#app-loading-title').innerHTML = 'HELLA Smart Factory Management Platform' // 富维海拉智慧工厂管理平台
 }
 
 setupAll()
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index c3ef09211..320790719 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -348,4 +348,5 @@ export enum DICT_TYPE {
   SUBJECT = 'subject', //科目
   REGION = 'region', //区域
   PART_CLASS = 'part_class', //备件分类
-}
\ No newline at end of file
+  MAINTENANCE_CYCLE ='maintenance_cycle' // 保养周期
+}
diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
new file mode 100644
index 000000000..b324fe9e1
--- /dev/null
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -0,0 +1,318 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const EquipmentMaintenanceMainRules = reactive({
+  number: [required],
+  equipmentCode: [required],
+  planNumber: [required],
+  status: [required],
+  factoryAreaCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '保养工单编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '描述',
+    field: 'describing',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '设备编号',
+    field: 'equipmentCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '设备分类',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班次枚举',
+    field: 'classes',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '保养计划工单号',
+    field: 'planNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '故障类型枚举',
+    field: 'faultType',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '保养周期',
+    field: 'cycle',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '保养次数',
+    field: 'times',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '验证人',
+    field: 'verifyer',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '验证内容',
+    field: 'verifyContent',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Editor',
+      componentProps: {
+        valueHtml: '',
+        height: 200
+      }
+    },
+  },
+  {
+    label: '验证时间',
+    field: 'verifyTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '保养人id',
+    field: 'maintenancer',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '保养人联系电话',
+    field: 'maintenancePhone',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '结果枚举临时措施、完成',
+    field: 'completeResult',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '完成时间',
+    field: 'completionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '保养时间',
+    field: 'maintenanceTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '流程状态枚举',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '所属厂区编号',
+    field: 'factoryAreaCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '车间编号',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工段编号',
+    field: 'workshopSectionCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用默认TRUE',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
new file mode 100644
index 000000000..248f1de3f
--- /dev/null
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="EquipmentMaintenanceMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="EquipmentMaintenanceMain.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="EquipmentMaintenanceMainRules"
+    :formAllSchemas="EquipmentMaintenanceMain.allSchemas"
+    :apiUpdate="EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain"
+    :apiCreate="EquipmentMaintenanceMainApi.createEquipmentMaintenanceMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="EquipmentMaintenanceMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/equipment-maintenance-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { EquipmentMaintenanceMain,EquipmentMaintenanceMainRules } from './equipmentMaintenanceMain.data'
+import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'EquipmentMaintenanceMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(EquipmentMaintenanceMain.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: EquipmentMaintenanceMainApi.getEquipmentMaintenanceMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentMaintenanceMain:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentMaintenanceMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentMaintenanceMain:export'}), // 导出
+  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 == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceMain:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+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 =EquipmentMaintenanceMain.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 EquipmentMaintenanceMainApi.createEquipmentMaintenanceMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(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, 'basicEquipmentMaintenanceMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await EquipmentMaintenanceMainApi.deleteEquipmentMaintenanceMain(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 EquipmentMaintenanceMainApi.exportEquipmentMaintenanceMain(tableObject.params)
+    download.excel(data, '设备保养工单主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '设备保养工单主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await EquipmentMaintenanceMainApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/eam/maintenance/index.vue b/src/views/eam/maintenance/index.vue
index 9409b27b2..2c4ff5eb7 100644
--- a/src/views/eam/maintenance/index.vue
+++ b/src/views/eam/maintenance/index.vue
@@ -48,6 +48,7 @@
     :apiCreate="MaintenanceApi.createMaintenance"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -65,7 +66,10 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import * as BasicInspectionOptionApi from "@/api/eam/basicInspectionOption";
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import { ToolAccounts } from "@/views/eam/toolAccounts/ToolAccounts.data";
+import * as ToolItemApi from "@/api/eam/toolAccounts";
 
 defineOptions({ name: 'Maintenance' })
 
@@ -243,6 +247,35 @@ const handleDisable = async (id: number) => {
   } catch {}
 }
 
+const onChange = (field, item) => {
+    console.log(field)
+    console.log(item)
+    //设备
+    if(field == 'type' && item == 'DEVICE'){
+      Maintenance.allSchemas.formSchema.forEach((items) => {
+        if (items.field == 'equipmentCode') {
+          basicFormRef.value.formRef.setValues({
+            equipmentCode:''
+          })
+          items.componentProps.searchAllSchemas = EquipmentAccounts.allSchemas
+          items.componentProps.searchPage = EquipmentItemApi.getEquipmentAccountsPage
+        }
+      })
+    }
+    //工装
+    if(field == 'type' && item == 'EQUIPMENT'){
+      Maintenance.allSchemas.formSchema.forEach((items) => {
+        if (items.field == 'equipmentCode') {
+          basicFormRef.value.formRef.setValues({
+            equipmentCode:''
+          })
+          items.componentProps.searchAllSchemas = ToolAccounts.allSchemas
+          items.componentProps.searchPage = ToolItemApi.getToolAccountsPage
+        }
+      })
+    }
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts
index d8eacab32..a75cc0886 100644
--- a/src/views/eam/maintenance/maintenance.data.ts
+++ b/src/views/eam/maintenance/maintenance.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { EquipmentAccounts } from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 
 // 表单校验
 export const MaintenanceRules = reactive({
@@ -33,16 +35,37 @@ export const Maintenance = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '设备编号',
-    field: 'equipmentCode',
+    label: '设备类别',
+    field: 'type',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '设备类别枚举',
-    field: 'type',
+    label: '设备编号',
+    field: 'equipmentCode',
     sort: 'custom',
     isSearch: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        multiple:true,
+        searchCondition: [{
+          key: 'status',
+          value: 'NORMAL',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '方案编号',
@@ -53,6 +76,8 @@ export const Maintenance = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '周期',
     field: 'cycle',
+    dictType: DICT_TYPE.MAINTENANCE_CYCLE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
   },
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index 1081eec14..04ec8d045 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -16,7 +16,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table v-clientTable ref="tableRef" :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +26,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -90,6 +91,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
   defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -110,7 +112,9 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val=='selection_point'){//批量打印
+    handleSelectionPoint()
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -186,6 +190,16 @@ const handlePoint = async (row) => {
   window.open(src.value+'&id='+row.id)
 }
 
+const srcPoint = ref(BASE_URL + '/jmreport/view/953469704945139712?token=' + getAccessToken())
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  console.log('批量打印',rows.join(','))
+  window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -196,6 +210,34 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+watch(
+  () => tableObject.tableList,
+  () => {
+    const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
+    if(currentRows){
+      nextTick(() => {
+        currentRows.selectionRows.forEach(item=>{
+          tableRef.value.toggleRowSelection(item,true)
+        })
+      })
+    }
+  }
+)
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 7562032b5..053d9afa2 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -197,12 +197,21 @@ DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
-      },]
+      },
+      {
+        key: 'customerCode',
+        value: 'customerCode' ,
+        isMainValue: true
+      }]
       item.form.componentProps.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value,
         isMainValue: false
+      },{
+        key: 'customerCode',
+        value: 'customerCode' ,
+        isMainValue: true
       }]
       }
   })
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 004cafd62..f5ebb517b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1268,9 +1268,6 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
 //表单校验
 export const PurchasereceiptRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请输入包装号', trigger: 'blur' }
-  ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],