From 39e91bb8dce77002c034b95b547488fe36e649b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 29 Feb 2024 08:54:47 +0800
Subject: [PATCH 1/3] =?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

---
 .../eam/device/deviceInternalAudit/index.ts   |  59 +++++
 .../deviceInternalAudit.data.ts               | 179 +++++++++++++
 .../eam/device/deviceInternalAudit/index.vue  | 244 ++++++++++++++++++
 3 files changed, 482 insertions(+)
 create mode 100644 src/api/eam/device/deviceInternalAudit/index.ts
 create mode 100644 src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts
 create mode 100644 src/views/eam/device/deviceInternalAudit/index.vue

diff --git a/src/api/eam/device/deviceInternalAudit/index.ts b/src/api/eam/device/deviceInternalAudit/index.ts
new file mode 100644
index 0000000..ed90b3e
--- /dev/null
+++ b/src/api/eam/device/deviceInternalAudit/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface DeviceInternalAuditVO {
+  id: number
+  number: string
+  describes: string
+  personer: string
+  fitOut: number
+  coating: number
+  injectionMolding: number
+  business: number
+  laboratory: number
+  it: number
+  qualityDepartment: number
+  materialFlow: number
+  moldPre: number
+  available: string
+}
+
+// 查询设备内审业务说明列表
+export const getDeviceInternalAuditPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/device-internal-audit/senior', data })
+  } else {
+    return await request.get({ url: `/eam/device-internal-audit/page`, params })
+  }
+}
+
+// 查询设备内审业务说明详情
+export const getDeviceInternalAudit = async (id: number) => {
+  return await request.get({ url: `/eam/device-internal-audit/get?id=` + id })
+}
+
+// 新增设备内审业务说明
+export const createDeviceInternalAudit = async (data: DeviceInternalAuditVO) => {
+  return await request.post({ url: `/eam/device-internal-audit/create`, data })
+}
+
+// 修改设备内审业务说明
+export const updateDeviceInternalAudit = async (data: DeviceInternalAuditVO) => {
+  return await request.put({ url: `/eam/device-internal-audit/update`, data })
+}
+
+// 删除设备内审业务说明
+export const deleteDeviceInternalAudit = async (id: number) => {
+  return await request.delete({ url: `/eam/device-internal-audit/delete?id=` + id })
+}
+
+// 导出设备内审业务说明 Excel
+export const exportDeviceInternalAudit = async (params) => {
+  return await request.download({ url: `/eam/device-internal-audit/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/device-internal-audit/get-import-template' })
+}
diff --git a/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts
new file mode 100644
index 0000000..960cfe7
--- /dev/null
+++ b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts
@@ -0,0 +1,179 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const DeviceInternalAuditRules = reactive({
+  number: [required],
+  personer: [required],
+})
+
+export const DeviceInternalAudit = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '内审编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+ 
+  {
+    label: '人员',
+    field: 'personer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '装配',
+    field: 'fitOut',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '涂装',
+    field: 'coating',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '注塑',
+    field: 'injectionMolding',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '商务',
+    field: 'business',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '实验室',
+    field: 'laboratory',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: 'IT',
+    field: 'it',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '质量保障部',
+    field: 'qualityDepartment',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 180,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '物流',
+    field: 'materialFlow',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '模具前期',
+    field: 'moldPre',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    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: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    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: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/device/deviceInternalAudit/index.vue b/src/views/eam/device/deviceInternalAudit/index.vue
new file mode 100644
index 0000000..aee747f
--- /dev/null
+++ b/src/views/eam/device/deviceInternalAudit/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeviceInternalAudit.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DeviceInternalAudit.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="DeviceInternalAuditRules"
+    :formAllSchemas="DeviceInternalAudit.allSchemas"
+    :apiUpdate="DeviceInternalAuditApi.updateDeviceInternalAudit"
+    :apiCreate="DeviceInternalAuditApi.createDeviceInternalAudit"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceInternalAudit.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/record/device-internal-audit/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DeviceInternalAudit,DeviceInternalAuditRules } from './deviceInternalAudit.data'
+import * as DeviceInternalAuditApi from '@/api/eam/device/deviceInternalAudit'
+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: 'DeviceInternalAudit' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DeviceInternalAudit.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: DeviceInternalAuditApi.getDeviceInternalAuditPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:deviceInternalAudit:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:deviceInternalAudit: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(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 =DeviceInternalAudit.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 DeviceInternalAuditApi.createDeviceInternalAudit(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await DeviceInternalAuditApi.updateDeviceInternalAudit(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, 'basicDeviceInternalAudit')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeviceInternalAuditApi.deleteDeviceInternalAudit(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 DeviceInternalAuditApi.exportDeviceInternalAudit(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 DeviceInternalAuditApi.importTemplate()
+})
+
+</script>

From 87a6d28214429a90ac6920ad0bf4302aa5935f64 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 29 Feb 2024 09:34:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 ++
 .../Detail/src/DetailDeviceLedger.vue         |  1 +
 src/components/UploadFile/src/UploadFile.vue  | 20 +++++++++++++++++--
 src/views/eam/device/problemSolving/index.vue |  7 +++++++
 .../problemSolving/problemSolving.data.ts     |  3 +--
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 8cc85c7..831eb70 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -380,8 +380,10 @@ const open = async (type: string, row?: any, masterParmas?: any) => {
     formLoading.value = true
     try {
       nextTick(() => {
+      console.log('row11',row)
         formRef.value.setValues(row)
       })
+    
     } finally {
       formLoading.value = false
     }
diff --git a/src/components/Detail/src/DetailDeviceLedger.vue b/src/components/Detail/src/DetailDeviceLedger.vue
index 0d352d6..cf0a09a 100644
--- a/src/components/Detail/src/DetailDeviceLedger.vue
+++ b/src/components/Detail/src/DetailDeviceLedger.vue
@@ -594,6 +594,7 @@ const getImage = () => {
         if (imageParmas.value.funcCode == 'device_mould_picture') {
           imageFormData.value.filePathList = res
         } else {
+          console.log(444,res)
           fileFormData.value.filePathList = res
           formKey.value += 1
         }
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 464a54a..2047ff7 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -6,7 +6,7 @@
       name="file"
       v-model="valueRef"
       v-model:file-list="fileList"
-      :show-file-list="true"
+      :show-file-list="isShowFileList"
       :auto-upload="autoUpload"
       :action="updateUrl"
       :headers="uploadHeaders"
@@ -28,6 +28,7 @@
         <div style="font-size: 8px;line-height: initial;">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
+        <Preview1 :fileList="fileList" v-if="!isShowFile"/>
       </template>
       <template  v-if="!isShowFile" #file >
           <div>
@@ -42,6 +43,7 @@ import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+import  Preview1  from '@/components/UploadFile/src/Preview.vue'
 
 defineOptions({ name: 'UploadFile' })
 
@@ -63,19 +65,25 @@ const props = defineProps({
   drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
+  // isShowFileList: propTypes.bool.def(true), // 是否显示自己上传的文件
   
 })
 // ========== 上传相关 ==========
+// setTimeout(()=>{
+
+// console.log('props.modelValue',props.modelValue)
+// },2000)
 const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
-console.log('88',props.modelValue)
+
 const fileList = props.modelValue && props.modelValue.length > 0 ? ref<UploadUserFile[]>(props.modelValue) : ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
   'tenant-id': getTenantId()
 })
+
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
@@ -149,6 +157,14 @@ const listToString = (list: UploadUserFile[], separator?: string) => {
   }
   return strs != '' ? strs.substr(0, strs.length - 1) : ''
 }
+watch(
+  () => props.modelValue,
+  (val) => {
+    // if (val === unref(colorVal)) return
+    valueRef.value = val
+    fileList.value = val && val.length > 0 ?val:[]
+  }
+)
 </script>
 <style scoped lang="scss">
 .upload-file-uploader {
diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue
index b603df2..66303da 100644
--- a/src/views/eam/device/problemSolving/index.vue
+++ b/src/views/eam/device/problemSolving/index.vue
@@ -126,6 +126,13 @@
   /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = (type : string, row ?: any) => {
+    // console.log(99,row)
+    row.filePathListView = row.filePathList.map(item=>{
+      return {
+        name:item,
+        url:item
+      }
+    })
     basicFormRef.value.open(type, row)
   }
 
diff --git a/src/views/eam/device/problemSolving/problemSolving.data.ts b/src/views/eam/device/problemSolving/problemSolving.data.ts
index 1302a63..9fb6e8a 100644
--- a/src/views/eam/device/problemSolving/problemSolving.data.ts
+++ b/src/views/eam/device/problemSolving/problemSolving.data.ts
@@ -45,7 +45,6 @@ export const ProblemSolving = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'UploadFile',
       componentProps: {
-
       }
     }
   },
@@ -60,7 +59,7 @@ export const ProblemSolving = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'UploadFile',
       componentProps: {
-  
+        
       }
     }
   },

From 5eac7000602965da71be547c394baa4d69803aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 29 Feb 2024 13:24:52 +0800
Subject: [PATCH 3/3] =?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

---
 .../deviceMaintenance.data.ts                 |  30 ++++-
 src/views/eam/basic/item/item.data.ts         |  13 +-
 src/views/eam/basic/location/location.data.ts |  20 +--
 .../basic/locationArea/locationArea.data.ts   |   7 +-
 src/views/eam/basic/supplier/supplier.data.ts |  14 +-
 .../item/itemAccounts/itemAccounts.data.ts    |   3 -
 .../item/itemOrderMain/itemOrderMain.data.ts  | 125 ++++++++++++++++--
 7 files changed, 174 insertions(+), 38 deletions(-)

diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
index 26b0201..07e6783 100644
--- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
+++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts
@@ -100,7 +100,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '保养类型',
+    label: '保养周期',
     field: 'executionCycle',
     dictType: DICT_TYPE.EXECUTION_CYCLE,
     dictClass: 'string',
@@ -110,6 +110,32 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
+  
+  {
+    label: '人数',
+    field: 'peopleNum',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '保养所需时间（h）',
+    field: 'maintenanceTime',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
   {
     label: '是否可用',
     field: 'available',
@@ -144,4 +170,4 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
\ No newline at end of file
+]))
diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts
index 4800dba..8605ab2 100644
--- a/src/views/eam/basic/item/item.data.ts
+++ b/src/views/eam/basic/item/item.data.ts
@@ -2,10 +2,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 
 // 表单校验
 export const ItemRules = reactive({
-  number: [required],
-  name: [required],
-  uom: [required],
-  concurrencyStamp: [required],
+   name: [
+      { required: true, message: '请输入备件名称', trigger: 'blur' }, 
+      { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    ],
 })
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
@@ -188,6 +188,11 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/basic/location/location.data.ts b/src/views/eam/basic/location/location.data.ts
index aa480c6..868c683 100644
--- a/src/views/eam/basic/location/location.data.ts
+++ b/src/views/eam/basic/location/location.data.ts
@@ -5,10 +5,14 @@ import { LocationArea } from '../locationArea/locationArea.data'
 
 // 表单校验
 export const LocationRules = reactive({
-  number: [required],
-  name: [required],
-  areaNumber: [required],
-  concurrencyStamp: [required],
+  name: [
+    { required: true, message: '请输入库位名称', trigger: 'blur' }, 
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  areaNumber: [
+    { required: true, message: '请选择库区编号', trigger: 'blur' }, 
+  ],
+  
 })
 
 export const Location = useCrudSchemas(reactive<CrudSchema[]>([
@@ -58,7 +62,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.LOCATION_AREA_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Select'
     },
@@ -68,7 +72,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isInAccount',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -93,7 +97,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -130,4 +134,4 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
\ No newline at end of file
+]))
diff --git a/src/views/eam/basic/locationArea/locationArea.data.ts b/src/views/eam/basic/locationArea/locationArea.data.ts
index 151e3ca..06d5688 100644
--- a/src/views/eam/basic/locationArea/locationArea.data.ts
+++ b/src/views/eam/basic/locationArea/locationArea.data.ts
@@ -3,9 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const LocationAreaRules = reactive({
-  number: [required],
-  name: [required],
-  concurrencyStamp: [required],
+  name: [
+    { required: true, message: '请输入库区名称', trigger: 'blur' }, 
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
diff --git a/src/views/eam/basic/supplier/supplier.data.ts b/src/views/eam/basic/supplier/supplier.data.ts
index 07e75d1..94a12e6 100644
--- a/src/views/eam/basic/supplier/supplier.data.ts
+++ b/src/views/eam/basic/supplier/supplier.data.ts
@@ -2,8 +2,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 
 // 表单校验
 export const SupplierRules = reactive({
-  number: [required],
-  name: [required],
+ name: [
+   { required: true, message: '请输入供应商名称', trigger: 'blur' }, 
+   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
 })
 
 export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
@@ -28,7 +30,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '简称',
     field: 'shortName',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '联系人',
@@ -39,14 +41,14 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '联系电话',
     field: 'phone',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '状态',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -80,4 +82,4 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
\ No newline at end of file
+]))
diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
index 9db54bc..9198994 100644
--- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
@@ -88,7 +88,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.isConstant',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -119,7 +118,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150
@@ -171,7 +169,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.isRadeIn',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
index f59acc1..4efb684 100644
--- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
+++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts
@@ -16,30 +16,125 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
     table: {
-      width: 180,
+      width: 150,
       fixed: 'left'
     },
   },
   {
-    label: '申领人',
-    field: 'applyId',
+    label: '日期',
+    field: 'date',
     sort: 'custom',
-    isForm: false,
-    isSearch: false,
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '审批人',
-    field: 'approveId',
+    label: '电话',
+    field: 'phone',
     sort: 'custom',
-    isForm: false,
-    isSearch: false,
   },
   {
-    label: '出库人',
-    field: 'outId',
+    label: '传真',
+    field: 'fax',
     sort: 'custom',
-    isForm: false,
+  },
+  {
+    label: '采购员',
+    field: 'purchaser',
+    sort: 'custom',
+  },
+  {
+    label: '供应商编号',
+    field: 'supplierNumber',
+    sort: 'custom',
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+  },
+  {
+    label: '供应商地址',
+    field: 'supplierAddress',
+    sort: 'custom',
+  },
+  {
+    label: '发货至',
+    field: 'shipTo',
+    sort: 'custom',
+  },
+  {
+    label: '开票至',
+    field: 'invoiceTo',
+    sort: 'custom',
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+  },
+  {
+    label: '联系电话',
+    field: 'contactsPhone',
+    sort: 'custom',
+  },
+  {
+    label: '付款方式',
+    field: 'paymentType',
+    sort: 'custom',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '注册地',
+    field: 'registLocation',
+    sort: 'custom',
+  },
+  {
+    label: '开户行',
+    field: 'bank',
+    sort: 'custom',
+  },
+  {
+    label: '账号',
+    field: 'account',
+    sort: 'custom',
+  },
+  {
+    label: '税号',
+    field: 'dutyParagraph',
+    sort: 'custom',
+  },
+ {
+    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: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '状态',
@@ -51,6 +146,12 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: true,
     tableForm: {
       type: 'Select'
+    },
+    form: {
+      value: 'INCOMPLETE',
+     componentProps: {
+       disabled: true,
+     }
     }
   },
   {