From e2c88d181756a91495717c71829cf66fd319fa6e Mon Sep 17 00:00:00 2001
From: gaojs <js.gao@ccwin-in.com>
Date: Sun, 7 Apr 2024 16:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/partternType/index.ts             |  54 ----
 src/api/mes/pattern/index.ts                  |  66 +++++
 src/api/mes/patternType/index.ts              |  54 ++++
 src/views/mes/pattern/index.vue               | 244 ++++++++++++++++++
 src/views/mes/pattern/pattern.data.ts         | 217 ++++++++++++++++
 .../{partternType => patternType}/index.vue   |  50 ++--
 .../patternType.data.ts}                      |   5 +-
 7 files changed, 609 insertions(+), 81 deletions(-)
 delete mode 100644 src/api/mes/partternType/index.ts
 create mode 100644 src/api/mes/pattern/index.ts
 create mode 100644 src/api/mes/patternType/index.ts
 create mode 100644 src/views/mes/pattern/index.vue
 create mode 100644 src/views/mes/pattern/pattern.data.ts
 rename src/views/mes/{partternType => patternType}/index.vue (76%)
 rename src/views/mes/{partternType/partternType.data.ts => patternType/patternType.data.ts} (95%)

diff --git a/src/api/mes/partternType/index.ts b/src/api/mes/partternType/index.ts
deleted file mode 100644
index 29002581a..000000000
--- a/src/api/mes/partternType/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/config/axios'
-
-export interface PartternTypeVO {
-  deleteTime: Date
-  id: number
-  status: string
-  concurrencyStamp: number
-  remark: string
-  deleter: string
-  siteId: number
-  code: string
-  name: string
-}
-
-// 查询模具类型列表
-export const getPartternTypePage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/parttern-type/senior', data })
-  } else {
-    return await request.get({ url: `/mes/parttern-type/page`, params })
-  }
-}
-
-// 查询模具类型详情
-export const getPartternType = async (id: number) => {
-  return await request.get({ url: `/mes/parttern-type/get?id=` + id })
-}
-
-// 新增模具类型
-export const createPartternType = async (data: PartternTypeVO) => {
-  return await request.post({ url: `/mes/parttern-type/create`, data })
-}
-
-// 修改模具类型
-export const updatePartternType = async (data: PartternTypeVO) => {
-  return await request.put({ url: `/mes/parttern-type/update`, data })
-}
-
-// 删除模具类型
-export const deletePartternType = async (id: number) => {
-  return await request.delete({ url: `/mes/parttern-type/delete?id=` + id })
-}
-
-// 导出模具类型 Excel
-export const exportPartternType = async (params) => {
-  return await request.download({ url: `/mes/parttern-type/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/mes/parttern-type/get-import-template' })
-}
\ No newline at end of file
diff --git a/src/api/mes/pattern/index.ts b/src/api/mes/pattern/index.ts
new file mode 100644
index 000000000..2ee80689b
--- /dev/null
+++ b/src/api/mes/pattern/index.ts
@@ -0,0 +1,66 @@
+import request from '@/config/axios'
+
+export interface PatternVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  code: string
+  name: string
+  partternName: string
+  productCode: string
+  dateUseStart: Date
+  dateUseStop: Date
+  partternFrom: string
+  partternGo: string
+  initCout: number
+  effectStart: Date
+  effectEnd: Date
+  factoryCode: string
+  factoryName: string
+  factoryType: string
+}
+
+// 查询模具基本信息列表
+export const getPatternPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/pattern/senior', data })
+  } else {
+    return await request.get({ url: `/mes/pattern/page`, params })
+  }
+}
+
+// 查询模具基本信息详情
+export const getPattern = async (id: number) => {
+  return await request.get({ url: `/mes/pattern/get?id=` + id })
+}
+
+// 新增模具基本信息
+export const createPattern = async (data: PatternVO) => {
+  return await request.post({ url: `/mes/pattern/create`, data })
+}
+
+// 修改模具基本信息
+export const updatePattern = async (data: PatternVO) => {
+  return await request.put({ url: `/mes/pattern/update`, data })
+}
+
+// 删除模具基本信息
+export const deletePattern = async (id: number) => {
+  return await request.delete({ url: `/mes/pattern/delete?id=` + id })
+}
+
+// 导出模具基本信息 Excel
+export const exportPattern = async (params) => {
+  return await request.download({ url: `/mes/pattern/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/pattern/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/patternType/index.ts b/src/api/mes/patternType/index.ts
new file mode 100644
index 000000000..f4bf226df
--- /dev/null
+++ b/src/api/mes/patternType/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface PatternTypeVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  code: string
+  name: string
+}
+
+// 查询模具类型列表
+export const getPatternTypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/pattern-type/senior', data })
+  } else {
+    return await request.get({ url: `/mes/pattern-type/page`, params })
+  }
+}
+
+// 查询模具类型详情
+export const getPatternType = async (id: number) => {
+  return await request.get({ url: `/mes/pattern-type/get?id=` + id })
+}
+
+// 新增模具类型
+export const createPatternType = async (data: PatternTypeVO) => {
+  return await request.post({ url: `/mes/pattern-type/create`, data })
+}
+
+// 修改模具类型
+export const updatePatternType = async (data: PatternTypeVO) => {
+  return await request.put({ url: `/mes/pattern-type/update`, data })
+}
+
+// 删除模具类型
+export const deletePatternType = async (id: number) => {
+  return await request.delete({ url: `/mes/pattern-type/delete?id=` + id })
+}
+
+// 导出模具类型 Excel
+export const exportPatternType = async (params) => {
+  return await request.download({ url: `/mes/pattern-type/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/pattern-type/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
new file mode 100644
index 000000000..7d201886a
--- /dev/null
+++ b/src/views/mes/pattern/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Pattern.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Pattern.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="PatternRules"
+    :formAllSchemas="Pattern.allSchemas"
+    :apiUpdate="PatternApi.updatePattern"
+    :apiCreate="PatternApi.createPattern"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Pattern.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/pattern/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Pattern,PatternRules } from './pattern.data'
+import * as PatternApi from '@/api/mes/pattern'
+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: 'Pattern' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Pattern.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: PatternApi.getPatternPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:pattern:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:pattern:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:pattern: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:'mes:pattern:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:pattern: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 =Pattern.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 PatternApi.createPattern(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PatternApi.updatePattern(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, 'basicPattern')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PatternApi.deletePattern(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 PatternApi.exportPattern(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 PatternApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/pattern/pattern.data.ts b/src/views/mes/pattern/pattern.data.ts
new file mode 100644
index 000000000..35d2afb1d
--- /dev/null
+++ b/src/views/mes/pattern/pattern.data.ts
@@ -0,0 +1,217 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PatternRules = reactive({
+  concurrencyStamp: [required],
+})
+
+export const Pattern = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    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: '主键',
+    field: 'id',
+    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: 'createTime',
+    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')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '删除用户名',
+    field: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '模具编码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具类型',
+    field: 'partternName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '启用时间',
+    field: 'dateUseStart',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '停用时间',
+    field: 'dateUseStop',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具来源',
+    field: 'partternFrom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具去向',
+    field: 'partternGo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '模具初始数量',
+    field: 'initCout',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '有效期开始时间',
+    field: 'effectStart',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '有效期结束时间',
+    field: 'effectEnd',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '所属单位类别',
+    field: 'factoryType',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.QUALIFY_STATUS,
+    dictClass: 'string',
+    isForm: true,
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: '2',
+      componentProps: {
+        inactiveValue: '2',
+        activeValue: '1'
+      }
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isDetail:false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false
+  }
+]))
diff --git a/src/views/mes/partternType/index.vue b/src/views/mes/patternType/index.vue
similarity index 76%
rename from src/views/mes/partternType/index.vue
rename to src/views/mes/patternType/index.vue
index 77a6cefb8..acedd71fe 100644
--- a/src/views/mes/partternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PartternType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="PatternType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="PartternType.allSchemas"
+      :allSchemas="PatternType.allSchemas"
     />
 
   <!-- 列表 -->
@@ -42,31 +42,31 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :rules="PartternTypeRules"
-    :formAllSchemas="PartternType.allSchemas"
-    :apiUpdate="PartternTypeApi.updatePartternType"
-    :apiCreate="PartternTypeApi.createPartternType"
+    :rules="PatternTypeRules"
+    :formAllSchemas="PatternType.allSchemas"
+    :apiUpdate="PatternTypeApi.updatePatternType"
+    :apiCreate="PatternTypeApi.createPatternType"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="PartternType.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="PatternType.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/mes/parttern-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/mes/pattern-type/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { PartternType,PartternTypeRules } from './partternType.data'
-import * as PartternTypeApi from '@/api/mes/partternType'
+import { PatternType,PatternTypeRules } from './patternType.data'
+import * as PatternTypeApi from '@/api/mes/patternType'
 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: 'PartternType' })
+defineOptions({ name: 'PatternType' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -74,7 +74,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PartternType.allSchemas.tableColumns)
+const tableColumns = ref(PatternType.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PartternTypeApi.getPartternTypePage // 分页接口
+  getListApi: PatternTypeApi.getPatternTypePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'mes:partternType:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:partternType:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:partternType:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'mes:patternType:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:patternType:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:patternType:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:partternType:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:partternType:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'mes:patternType:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:patternType:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -154,7 +154,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =PartternType.allSchemas.formSchema.some(function (item) {
+  var isHave =PatternType.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
   if(isHave){
@@ -166,10 +166,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await PartternTypeApi.createPartternType(data)
+    await PatternTypeApi.createPatternType(data)
     message.success(t('common.createSuccess'))
   } else {
-    await PartternTypeApi.updatePartternType(data)
+    await PatternTypeApi.updatePatternType(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicPartternType')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicPatternType')
 }
 
 /** 删除按钮操作 */
@@ -188,7 +188,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await PartternTypeApi.deletePartternType(id)
+    await PatternTypeApi.deletePatternType(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -203,7 +203,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PartternTypeApi.exportPartternType(tableObject.params)
+    const data = await PatternTypeApi.exportPatternType(tableObject.params)
     download.excel(data, '模具类型.xlsx')
   } catch {
   } finally {
@@ -238,7 +238,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PartternTypeApi.importTemplate()
+  importTemplateData.templateUrl = await PatternTypeApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/mes/partternType/partternType.data.ts b/src/views/mes/patternType/patternType.data.ts
similarity index 95%
rename from src/views/mes/partternType/partternType.data.ts
rename to src/views/mes/patternType/patternType.data.ts
index 2cf9df99c..3ec104df8 100644
--- a/src/views/mes/partternType/partternType.data.ts
+++ b/src/views/mes/patternType/patternType.data.ts
@@ -2,11 +2,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
-export const PartternTypeRules = reactive({
+export const PatternTypeRules = reactive({
   code: [required],
+  name: [required]
 })
 
-export const PartternType = useCrudSchemas(reactive<CrudSchema[]>([
+export const PatternType = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '删除时间',
     field: 'deleteTime',