diff --git a/src/api/mes/holidayCalendar/index.ts b/src/api/mes/holidayCalendar/index.ts
new file mode 100644
index 000000000..8bd1e0808
--- /dev/null
+++ b/src/api/mes/holidayCalendar/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface HolidayCalendarVO {
+  id: number
+  holidayDate: Date
+  endTime: Date
+  textOne: string
+  textTwo: string
+  textThree: string
+  textFour: string
+  textFive: string
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+}
+
+// 查询节假日设置日历列表
+export const getHolidayCalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/holidayCalendar/senior', data })
+  } else {
+    return await request.get({ url: `/mes/holidayCalendar/page`, params })
+  }
+}
+
+// 查询节假日设置日历详情
+export const getHolidayCalendar = async (id: number) => {
+  return await request.get({ url: `/mes/holidayCalendar/get?id=` + id })
+}
+
+// 新增节假日设置日历
+export const createHolidayCalendar = async (data: HolidayCalendarVO) => {
+  return await request.post({ url: `/mes/holidayCalendar/create`, data })
+}
+
+// 修改节假日设置日历
+export const updateHolidayCalendar = async (data: HolidayCalendarVO) => {
+  return await request.put({ url: `/mes/holidayCalendar/update`, data })
+}
+
+// 删除节假日设置日历
+export const deleteHolidayCalendar = async (id: number) => {
+  return await request.delete({ url: `/mes/holidayCalendar/delete?id=` + id })
+}
+
+// 导出节假日设置日历 Excel
+export const exportHolidayCalendar = async (params) => {
+  return await request.download({ url: `/mes/holidayCalendar/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/holidayCalendar/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/holidaySetting/index.ts b/src/api/mes/holidaySetting/index.ts
deleted file mode 100644
index 979a7e633..000000000
--- a/src/api/mes/holidaySetting/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-export interface HolidaySettingVO {
-  id: number
-  textOne: string
-  textTwo: string
-  textThree: string
-  textFour: string
-  textFive: string
-  deleteTime: Date
-  status: string
-  concurrencyStamp: number
-  remark: string
-  deleter: string
-  siteId: number
-  changeEmplId: number
-  holidayDate: Date
-  holidayFlag: string
-  holidayName: string
-}
-
-// 查询节假日设置列表
-export const getHolidaySettingPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/holidaySetting/senior', data })
-  } else {
-    return await request.get({ url: `/mes/holidaySetting/page`, params })
-  }
-}
-
-// 查询节假日设置详情
-export const getHolidaySetting = async (id: number) => {
-  return await request.get({ url: `/mes/holidaySetting/get?id=` + id })
-}
-
-// 新增节假日设置
-export const createHolidaySetting = async (data: HolidaySettingVO) => {
-  return await request.post({ url: `/mes/holidaySetting/create`, data })
-}
-
-// 修改节假日设置
-export const updateHolidaySetting = async (data: HolidaySettingVO) => {
-  return await request.put({ url: `/mes/holidaySetting/update`, data })
-}
-
-// 删除节假日设置
-export const deleteHolidaySetting = async (id: number) => {
-  return await request.delete({ url: `/mes/holidaySetting/delete?id=` + id })
-}
-
-// 导出节假日设置 Excel
-export const exportHolidaySetting = async (params) => {
-  return await request.download({ url: `/mes/holidaySetting/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/mes/holidaySetting/get-import-template' })
-}
\ No newline at end of file
diff --git a/src/api/mes/ordermonthplan/index.ts b/src/api/mes/ordermonthplan/index.ts
new file mode 100644
index 000000000..3c86a1a5c
--- /dev/null
+++ b/src/api/mes/ordermonthplan/index.ts
@@ -0,0 +1,60 @@
+import request from '@/config/axios'
+
+export interface MesOrderMonthMainVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  sourceType: string
+  planMasterCode: string
+  planSubCode: string
+  planType: string
+  checker: string
+  checkDate: string
+  factoryCode: string
+  factoryName: string
+}
+
+// 查询订单计划月主列表
+export const getMesOrderMonthMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/plan/mes-order-month-main/senior', data })
+  } else {
+    return await request.get({ url: `/plan/mes-order-month-main/page`, params })
+  }
+}
+
+// 查询订单计划月主详情
+export const getMesOrderMonthMain = async (id: number) => {
+  return await request.get({ url: `/plan/mes-order-month-main/get?id=` + id })
+}
+
+// 新增订单计划月主
+export const createMesOrderMonthMain = async (data: MesOrderMonthMainVO) => {
+  return await request.post({ url: `/plan/mes-order-month-main/create`, data })
+}
+
+// 修改订单计划月主
+export const updateMesOrderMonthMain = async (data: MesOrderMonthMainVO) => {
+  return await request.put({ url: `/plan/mes-order-month-main/update`, data })
+}
+
+// 删除订单计划月主
+export const deleteMesOrderMonthMain = async (id: number) => {
+  return await request.delete({ url: `/plan/mes-order-month-main/delete?id=` + id })
+}
+
+// 导出订单计划月主 Excel
+export const exportMesOrderMonthMain = async (params) => {
+  return await request.download({ url: `/plan/mes-order-month-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/plan/mes-order-month-main/get-import-template' })
+}
diff --git a/src/api/mes/reworkBatch/index.ts b/src/api/mes/reworkBatch/index.ts
new file mode 100644
index 000000000..0ab7e798c
--- /dev/null
+++ b/src/api/mes/reworkBatch/index.ts
@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface ReworkBatchVO {
+  deleteTime: Date
+  id: number
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  reworkType: string
+  productionCode: string
+  productionCount: string
+  reworkAction: string
+  replaceFlag: string
+  reworkPersoncode: string
+  reworkTime: Date
+  reworkResult: string
+  reworkbillNo: string
+}
+
+// 查询返工登记批量列表
+export const getReworkBatchPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/rework-batch/senior', data })
+  } else {
+    return await request.get({ url: `/mes/rework-batch/page`, params })
+  }
+}
+
+// 查询返工登记批量详情
+export const getReworkBatch = async (id: number) => {
+  return await request.get({ url: `/mes/rework-batch/get?id=` + id })
+}
+
+// 新增返工登记批量
+export const createReworkBatch = async (data: ReworkBatchVO) => {
+  return await request.post({ url: `/mes/rework-batch/create`, data })
+}
+
+// 修改返工登记批量
+export const updateReworkBatch = async (data: ReworkBatchVO) => {
+  return await request.put({ url: `/mes/rework-batch/update`, data })
+}
+
+// 删除返工登记批量
+export const deleteReworkBatch = async (id: number) => {
+  return await request.delete({ url: `/mes/rework-batch/delete?id=` + id })
+}
+
+// 中止返工登记单件
+export const suspendReworkSingle = async (id: number) => {
+  return await request.delete({ url: `/mes/rework-batch/suspend?id=` + id })
+}
+
+// 领取返工登记单件
+export const receiveReworkSingle = async (id: number) => {
+  return await request.put({ url: `/mes/rework-batch/receive?id=` + id })
+}
+
+// 完成返工登记单件
+export const finishReworkSingle = async (id: number) => {
+  return await request.put({ url: `/mes/rework-batch/finish?id=` + id })
+}
+
+// 导出返工登记批量 Excel
+export const exportReworkBatch = async (params) => {
+  return await request.download({ url: `/mes/rework-batch/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/rework-batch/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/mes/reworkSingle/index.ts b/src/api/mes/reworkSingle/index.ts
index 596a908cc..d84be3231 100644
--- a/src/api/mes/reworkSingle/index.ts
+++ b/src/api/mes/reworkSingle/index.ts
@@ -49,6 +49,22 @@ export const deleteReworkSingle = async (id: number) => {
   return await request.delete({ url: `/mes/rework-single/delete?id=` + id })
 }
 
+// 中止返工登记单件
+export const suspendReworkSingle = async (id: number) => {
+  return await request.delete({ url: `/mes/rework-single/suspend?id=` + id })
+}
+
+// 领取返工登记单件
+export const receiveReworkSingle = async (id: number) => {
+  return await request.put({ url: `/mes/rework-single/receive?id=` + id })
+}
+
+// 完成返工登记单件
+export const finishReworkSingle = async (id: number) => {
+  return await request.put({ url: `/mes/rework-single/finish?id=` + id })
+}
+
+
 // 导出返工登记单件 Excel
 export const exportReworkSingle = async (params) => {
   return await request.download({ url: `/mes/rework-single/export-excel`, params })
diff --git a/src/api/qms/inspectionPlan/index.ts b/src/api/qms/inspectionPlan/index.ts
new file mode 100644
index 000000000..1c07a30d3
--- /dev/null
+++ b/src/api/qms/inspectionPlan/index.ts
@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+
+
+// 查询采样过程列表
+export const getListByTempleteCode = async (code) => {
+  return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
+}
+// 新增
+export const inspectionTemplateCreat = async (data) => {
+  return await request.post({ url: `/qms/programme-template/create`,data})
+}
+// 编辑
+export const inspectionTemplateUpdate = async (data) => {
+  return await request.put({ url: `/qms/programme-template/update`,data})
+}
+// 删除
+export const inspectionTemplateDelete = async (id) => {
+  return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
+}
+// 列表
+export const inspectionTemplatePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/accountcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/qms/programme-template/page`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts
index 78bc8235f..1c07a30d3 100644
--- a/src/api/qms/inspectionTemplate/index.ts
+++ b/src/api/qms/inspectionTemplate/index.ts
@@ -3,6 +3,28 @@ import request from '@/config/axios'
 
 
 // 查询采样过程列表
-export const getInspectionProcessPage = async (params) => {
-  return await request.get({ url: `/qms/inspection-process/page`})
+export const getListByTempleteCode = async (code) => {
+  return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
+}
+// 新增
+export const inspectionTemplateCreat = async (data) => {
+  return await request.post({ url: `/qms/programme-template/create`,data})
+}
+// 编辑
+export const inspectionTemplateUpdate = async (data) => {
+  return await request.put({ url: `/qms/programme-template/update`,data})
+}
+// 删除
+export const inspectionTemplateDelete = async (id) => {
+  return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
+}
+// 列表
+export const inspectionTemplatePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/accountcalendar/senior', data })
+  } else {
+    return await request.get({ url: `/qms/programme-template/page`, params })
+  }
 }
\ No newline at end of file
diff --git a/src/api/qms/sampleCode/index.ts b/src/api/qms/sampleCode/index.ts
index 021edea4e..3f8e22f45 100644
--- a/src/api/qms/sampleCode/index.ts
+++ b/src/api/qms/sampleCode/index.ts
@@ -5,13 +5,13 @@ export interface SampleCodeVO {
   code: string
   batchLowLimiting: number
   batchUpperLimiting: number
-  s1: number
-  s2: number
-  s3: number
-  s4: number
-  g1: number
-  g2: number
-  g3: number
+  s1: string
+  s2: string
+  s3: string
+  s4: string
+  g1: string
+  g2: string
+  g3: string
   available: string
 }
 
diff --git a/src/api/qms/samplingProcess/index.ts b/src/api/qms/samplingProcess/index.ts
index 68a42f63a..96404d545 100644
--- a/src/api/qms/samplingProcess/index.ts
+++ b/src/api/qms/samplingProcess/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface SamplingProcessVO {
   id: number
   code: string
-  describe: string
+  description: string
   sampleType: string
   evaluationMode: string
   sampleSize: number
@@ -50,4 +50,4 @@ export const exportSamplingProcess = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/sampling-process/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/qms/samplingScheme/index.ts b/src/api/qms/samplingScheme/index.ts
index c2b247e56..34dfe4d83 100644
--- a/src/api/qms/samplingScheme/index.ts
+++ b/src/api/qms/samplingScheme/index.ts
@@ -4,7 +4,6 @@ export interface SamplingSchemeVO {
   id: number
   code: string
   describe: string
-  status: string
   available: string
 }
 
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bdeb41002..4977efef5 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -266,6 +266,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // TableForm 的第几列按钮
+  indexTableColumn :{
+    type: Number,
+    required: false,
+    default: 0
+  }
 })
 
 const { t } = useI18n() // 国际化
@@ -576,7 +582,7 @@ const handleAddTable = () => {
     tableAllSchemas.value.tableFormColumns.forEach(item => {
       tableFormKeys[item.field] = item.default ? item.default : ''
     })
-    inpuFocus(tableAllSchemas.value.tableFormColumns[0],tableFormKeys,0)
+    inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0)
   }else{
     emit('handleAddTable')
   }
diff --git a/src/layout/components/CategoryHeader.vue b/src/layout/components/CategoryHeader.vue
new file mode 100644
index 000000000..dc9876512
--- /dev/null
+++ b/src/layout/components/CategoryHeader.vue
@@ -0,0 +1,109 @@
+<script lang="tsx">
+import { defineComponent, computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAppStore } from '@/store/modules/app'
+import { isUrl } from '@/utils/is'
+import { pathResolve } from '@/utils/routerHelper'
+import type { RouteMeta } from 'vue-router'
+import { ElMenu, ElMenuItem } from 'element-plus'
+import { usePermissionStore } from '@/store/modules/permission'
+import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
+import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
+// 头部工具
+import { useDesign } from '@/hooks/web/useDesign'
+const { getPrefixCls, variables } = useDesign()
+const appStore = useAppStore()
+const layout = computed(() => appStore.getLayout)
+
+const prefixCls = getPrefixCls('tool-header')
+const permissionStore = usePermissionStore()
+const routers = computed(() =>
+      unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
+)
+
+const getPath = (route) => {
+  let routePath = route.path
+  if(routePath.startsWith('/')){
+    routePath =  route.path
+  }else{
+    routePath =  '/'+route.path
+  }
+  if(route.redirect){
+    return route.redirect
+  }else if(route.children){
+    return routePath+getPath(route.children[0])
+  }else{
+    return routePath
+  }
+}
+
+export default defineComponent({
+  name: 'CategoryHeader',
+  setup() {
+    console.log('useRouter()',useRouter())
+    const { push } = useRouter()
+    // backgroundColor="var(--left-menu-bg-color)"
+    // textColor="var(--left-menu-text-color)"
+    return () => (
+      <div
+        id={`${variables.namespace}-tool-header`}
+        class={[
+          prefixCls,
+          'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between',
+          'dark:bg-[var(--el-bg-color)]'
+        ]}
+      >
+      <ElMenu style="width:100%"
+          mode="horizontal"
+          backgroundColor="white"
+          textColor="var(--left-menu-bg-color)"
+          activeTextColor="var(--left-menu-text-active-color)"
+        >
+        {{
+            default: () => {
+              const { renderMenuTitle } = useRenderMenuTitle()
+              const categoryRouters =  unref(routers).filter(item=>item.meta.hidden!=true&&item.path!='/')
+              console.log('categoryRouters==',categoryRouters)
+              {/* default: () => renderMenuTitle(onlyOneChild ? onlyOneChild?.meta : meta) */}
+              return categoryRouters.map((v) => {
+                const meta = (v.meta ?? {}) as RouteMeta
+                const { onlyOneChild } = hasOneShowingChild(v.children, v)
+                const fullPath = isUrl(v.path) ? v.path : pathResolve('/', v.path) // getAllParentPath<AppRouteRecordRaw>(allRouters, v.path).join('/')
+
+                return (
+                  <ElMenuItem index={fullPath} onClick={()=>{
+                    console.log(v)
+                    appStore.setCategoryRoutePath(v.path)
+                  }}>
+                    {{
+                      default: () => renderMenuTitle(meta.title?meta:onlyOneChild?.meta)
+                    }}
+                  </ElMenuItem>
+                )
+              })
+            }
+        }}
+        </ElMenu>
+      
+      </div>
+    )
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+$prefix-cls: #{$namespace}-tool-header;
+
+.#{$prefix-cls} {
+  transition: left var(--transition-time-02);
+}
+
+::v-deep(.el-menu--horizontal>.el-menu-item){
+    border-radius: 5px;
+    height: 40px;
+    margin-right: 10px;
+    background: linear-gradient(to top left,var(--left-menu-bg-color),var(--left-menu-text-color));
+}
+
+</style>
+
diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index 9033616fe..c6880f299 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -45,6 +45,26 @@ export default defineComponent({
       unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
     )
 
+    const categoryRoutes = computed(() => {
+      const allRoutes = unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters
+      const categoryPath = appStore.getCategoryRoutePath
+      let findRoutes = allRoutes.find(item=>!item.meta.hidden&&item.path === categoryPath)
+      if(findRoutes){
+        findRoutes =  JSON.parse(JSON.stringify(findRoutes))
+        findRoutes?.children?.forEach(item => {
+          item.path = findRoutes?.path+'/'+item.path
+        });
+      }
+      let homeRoute = allRoutes.find(item=>!item.meta.hidden&&item.path === '/')
+      if(categoryPath!=homeRoute?.path&&homeRoute){
+        homeRoute =  JSON.parse(JSON.stringify(homeRoute))
+        homeRoute?.children?.forEach(item => {
+          item.path = homeRoute?.path+item.path
+        });
+      }
+      return categoryPath!=homeRoute?.path?[...homeRoute?.children||[],...findRoutes?.children||[]]:[...findRoutes?.children||[]]||homeRoute||[]
+    })
+
     const collapse = computed(() => appStore.getCollapse)
 
     const uniqueOpened = computed(() => appStore.getUniqueOpened)
@@ -95,7 +115,7 @@ export default defineComponent({
           {{
             default: () => {
               const { renderMenuItem } = useRenderMenuItem(unref(menuMode))
-              return renderMenuItem(unref(routers))
+              return appStore.getShowCategoryMenu?renderMenuItem(unref(categoryRoutes)):renderMenuItem(unref(routers))
             }
           }}
         </ElMenu>
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 2c5ae80d5..4d9ea8335 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -6,6 +6,7 @@ import { TagsView } from '@/layout/components/TagsView'
 import { Logo } from '@/layout/components/Logo'
 import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
+import CategoryHeader from './CategoryHeader.vue'
 import { ElScrollbar } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
 import RouterSearch from '@/components/RouterSearch/index.vue'
@@ -111,6 +112,12 @@ export const useRenderLayout = () => {
               ]}
               style="transition: all var(--transition-time-02);"
             >
+              {appStore.getShowCategoryMenu?(<CategoryHeader class={[
+                  'bg-[var(--top-header-bg-color)]',
+                  {
+                    'layout-border__bottom': !tagsView.value
+                  }
+                ]}></CategoryHeader>):undefined}
               <ToolHeader
                 class={[
                   'bg-[var(--top-header-bg-color)]',
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 2663e1280..c6ecfdd05 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -36,6 +36,8 @@ interface AppState {
   footer: boolean
   theme: ThemeTypes
   fixedMenu: boolean
+  categoryRoutePath:string
+  showCategoryMenu: boolean
 }
 
 export const useAppStore = defineStore('app', {
@@ -97,7 +99,9 @@ export const useAppStore = defineStore('app', {
         topHeaderHoverColor: '#f6f6f6',
         // 头部边框颜色
         topToolBorderColor: '#eee'
-      }
+      },
+      categoryRoutePath:'',
+      showCategoryMenu:false // true:顶部展示一级菜单栏 false:只有左侧菜单栏
     }
   },
   getters: {
@@ -175,7 +179,13 @@ export const useAppStore = defineStore('app', {
     },
     getFooter(): boolean {
       return this.footer
-    }
+    },
+    getCategoryRoutePath():string{
+      return this.categoryRoutePath
+    },
+    getShowCategoryMenu():boolean {
+      return this.showCategoryMenu
+    },
   },
   actions: {
     setBreadcrumb(breadcrumb: boolean) {
@@ -267,6 +277,9 @@ export const useAppStore = defineStore('app', {
     },
     setFooter(footer: boolean) {
       this.footer = footer
+    },
+    setCategoryRoutePath(path:string){
+      this.categoryRoutePath = path
     }
   }
 })
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 0b59fdb7b..9095ca7e5 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -250,6 +250,59 @@ export function mainListDeleteBtn(option:any) {
     hasPermi: ''
   })
 }
+
+// 主列表-中止按钮1
+export function mainListSuspend1Btn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '中止',
+    name: 'suspend',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-中止按钮2
+export function mainListSuspend2Btn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '中止',
+    name: 'suspend',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-领取按钮
+export function mainListReceiveBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '领取',
+    name: 'receive',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-完成按钮
+export function mainListFinishBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '完成',
+    name: 'finish',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-绑定
 export function mainListBindBtn(option:any) {
   return __defaultBtnOption(option,{
diff --git a/src/views/mes/holidaySetting/holidaySetting.data.ts b/src/views/mes/holidayCalendar/holidayCalendar.data.ts
similarity index 83%
rename from src/views/mes/holidaySetting/holidaySetting.data.ts
rename to src/views/mes/holidayCalendar/holidayCalendar.data.ts
index 4f7e833a6..6094de858 100644
--- a/src/views/mes/holidaySetting/holidaySetting.data.ts
+++ b/src/views/mes/holidayCalendar/holidayCalendar.data.ts
@@ -2,17 +2,62 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
-export const HolidaySettingRules = reactive({
+export const HolidayCalendarRules = reactive({
+  endTime: [required],
   concurrencyStamp: [required],
 })
 
-export const HolidaySetting = useCrudSchemas(reactive<CrudSchema[]>([
+export const HolidayCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
+    label: 'ID',
     field: 'id',
     sort: 'custom',
     isForm: false,
   },
+  {
+    label: '日期',
+    field: 'holidayDate',
+    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: 'endTime',
+    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: 'textOne',
@@ -122,50 +167,6 @@ export const HolidaySetting = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
-  {
-    label: '更改ID',
-    field: 'changeEmplId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '节假日日期',
-    field: 'holidayDate',
-    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: 'holidayFlag',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '节假日名称',
-    field: 'holidayName',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/mes/holidayCalendar/index.vue b/src/views/mes/holidayCalendar/index.vue
new file mode 100644
index 000000000..05ec182c2
--- /dev/null
+++ b/src/views/mes/holidayCalendar/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <div>
+    <el-calendar>
+      <template #date-cell="{ data }">
+        <div
+          style="height: 100"
+          :class="data.isSelected ? 'is-selected' : ''"
+          @click="handleClick(data.day)">
+          <div>{{ data.day.split('-').slice(1).join('-') }}</div>
+          <div v-if="arr.find((v) => v.date === data.day)">{{ arr.find((v) => v.date === data.day).content }}
+          </div>
+          <!-- <div>{{ data.isSelected ? '打羽毛球' : '' }}</div>  -->
+        </div>
+      </template>
+    </el-calendar>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Calendar',
+  data() {
+    return {
+      value: new Date(),
+      arr: [
+        { date: '2024-04-01', content: '打球' },
+        { date: '2024-04-02', content: '打台球' },
+        { date: '2024-04-03', content: '打篮球' },
+        { date: '2024-04-04', content: '踢足球' }
+      ]
+    }
+  },
+  methods: {
+    handleClick(date) {
+      alert(date)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/mes/holidaySetting/index.vue b/src/views/mes/ordermonthplan/index.vue
similarity index 68%
rename from src/views/mes/holidaySetting/index.vue
rename to src/views/mes/ordermonthplan/index.vue
index bb63733b0..31e9bca22 100644
--- a/src/views/mes/holidaySetting/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -1,18 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="HolidaySetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="MesOrderMonthMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="HolidaySetting.allSchemas"
-  />
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="MesOrderMonthMain.allSchemas"
+    />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -42,31 +42,31 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
-    :rules="HolidaySettingRules"
-    :formAllSchemas="HolidaySetting.allSchemas"
-    :apiUpdate="HolidaySettingApi.updateHolidaySetting"
-    :apiCreate="HolidaySettingApi.createHolidaySetting"
+    :rules="MesOrderMonthMainRules"
+    :formAllSchemas="MesOrderMonthMain.allSchemas"
+    :apiUpdate="MesOrderMonthMainApi.updateMesOrderMonthMain"
+    :apiCreate="MesOrderMonthMainApi.createMesOrderMonthMain"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="HolidaySetting.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="MesOrderMonthMain.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/mes/holidaySetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { HolidaySetting,HolidaySettingRules } from './holidaySetting.data'
-import * as HolidaySettingApi from '@/api/mes/holidaySetting'
+import { MesOrderMonthMain,MesOrderMonthMainRules } from './mesOrderMonthMain.data'
+import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
 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: 'MesHolidaySetting' })
+defineOptions({ name: 'MesOrderMonthMain' })
 
 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(HolidaySetting.allSchemas.tableColumns)
+const tableColumns = ref(MesOrderMonthMain.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: HolidaySettingApi.getHolidaySettingPage // 分页接口
+  getListApi: MesOrderMonthMainApi.getMesOrderMonthMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'mes:holidaySetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:holidaySetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:holidaySetting:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'wms:mesOrderMonthMain:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:mesOrderMonthMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:mesOrderMonthMain:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:holidaySetting:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:holidaySetting:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:mesOrderMonthMain:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mesOrderMonthMain:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -154,7 +154,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =HolidaySetting.allSchemas.formSchema.some(function (item) {
+  var isHave =MesOrderMonthMain.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 HolidaySettingApi.createHolidaySetting(data)
+    await MesOrderMonthMainApi.createMesOrderMonthMain(data)
     message.success(t('common.createSuccess'))
   } else {
-    await HolidaySettingApi.updateHolidaySetting(data)
+    await MesOrderMonthMainApi.updateMesOrderMonthMain(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, 'basicHolidaySetting')
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicMesOrderMonthMain')
 }
 
 /** 删除按钮操作 */
@@ -188,7 +188,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await HolidaySettingApi.deleteHolidaySetting(id)
+    await MesOrderMonthMainApi.deleteMesOrderMonthMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -203,8 +203,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await HolidaySettingApi.exportHolidaySetting(tableObject.params)
-    download.excel(data, '节假日设置.xlsx')
+    const data = await MesOrderMonthMainApi.exportMesOrderMonthMain(tableObject.params)
+    download.excel(data, '订单计划月主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -219,7 +219,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '节假日设置导入模版.xlsx'
+  templateTitle: '订单计划月主导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -238,8 +238,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await HolidaySettingApi.importTemplate()
+  importTemplateData.templateUrl = await MesOrderMonthMainApi.importTemplate()
 })
 
 </script>
-./holidaySetting.data
\ No newline at end of file
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
new file mode 100644
index 000000000..b30b0fc88
--- /dev/null
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -0,0 +1,86 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthMainRules = reactive({
+})
+
+export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    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: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '审核人',
+    field: 'checker',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/reworkBatch/index.vue b/src/views/mes/reworkBatch/index.vue
new file mode 100644
index 000000000..f2b515fd3
--- /dev/null
+++ b/src/views/mes/reworkBatch/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ReworkBatch.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ReworkBatch.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 #reworkbillNo="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.reworkbillNo)">
+          <span>{{ row.reworkbillNo }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ReworkBatchRules"
+    :formAllSchemas="ReworkBatch.allSchemas"
+    :apiUpdate="ReworkBatchApi.updateReworkBatch"
+    :apiCreate="ReworkBatchApi.createReworkBatch"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReworkBatch.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/rework-batch/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ReworkBatch,ReworkBatchRules } from './reworkBatch.data'
+import * as ReworkBatchApi from '@/api/mes/reworkBatch'
+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: 'MesReworkBatch' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ReworkBatch.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: ReworkBatchApi.getReworkBatchPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:reworkBatch:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'mes:reworkBatch:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:reworkBatch: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 isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata =  (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 编辑
+    defaultButtons.mainListSuspend1Btn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:delete'}), // 中止1
+    defaultButtons.mainListReceiveBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 领取
+    defaultButtons.mainListSuspend2Btn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:delete'}), // 中止2
+    defaultButtons.mainListFinishBtn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:update'}), // 完成
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'suspend') { // 中止1
+    handleSuspend(row.id)
+  } else if (val == 'receive') { // 领取
+    handleReceive(row.id)
+  } else if (val == 'suspend') { // 中止2
+    handleSuspend(row.id)
+  } else if (val == 'finish') { // 完成
+    handleFinish(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  if(type == "create"){
+    ReworkBatch.allSchemas.formSchema.forEach((item) => {
+        if(item.field == 'status'){
+          item.value = '1';
+          item.componentProps.disabled = true
+        }
+    })
+  }else{
+    ReworkBatch.allSchemas.formSchema.forEach((item) => {
+        if(item.field == 'status'){
+          item.componentProps.disabled = false
+        }
+    })
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ReworkBatch.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 ReworkBatchApi.createReworkBatch(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ReworkBatchApi.updateReworkBatch(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, 'basicReworkBatch')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ReworkBatchApi.deleteReworkBatch(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 中止按钮操作 */
+const handleSuspend = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否中止所选中任务？');
+    // 发起删除
+    await ReworkBatchApi.suspendReworkSingle(id)
+    message.success(t('中止成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 领取按钮操作 */
+const handleReceive = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否领取所选中任务？');
+    // 发起删除
+    await ReworkBatchApi.receiveReworkSingle(id)
+    message.success(t('领取成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 完成按钮操作 */
+const handleFinish = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否完成所选中任务？');
+    // 发起删除
+    await ReworkBatchApi.finishReworkSingle(id)
+    message.success(t('任务已完成'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ReworkBatchApi.exportReworkBatch(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 ReworkBatchApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/mes/reworkBatch/reworkBatch.data.ts b/src/views/mes/reworkBatch/reworkBatch.data.ts
new file mode 100644
index 000000000..cb89615e5
--- /dev/null
+++ b/src/views/mes/reworkBatch/reworkBatch.data.ts
@@ -0,0 +1,229 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+// 表单校验
+export const ReworkBatchRules = reactive({
+  reworkType: [required],
+  productionCode:[required],
+  replaceFlag:[required],
+  status:[required],
+})
+
+export const ReworkBatch = 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')]
+      }
+    },
+  },
+  {
+    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: 'reworkbillNo',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    isDetail: true
+  },
+  {
+    label: '工作类型',
+    field: 'reworkType',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.REWORK_TYPE,
+    dictClass: 'string',
+  },
+  {
+    label: '产品编码',
+    field: 'productionCode',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '产品编码', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'type',
+          action: 'in', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          value: 'BCP,CCP',//,SEMI]
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'productionCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '返修动作',
+    field: 'reworkAction',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否有替换件',
+    field: 'replaceFlag',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.REWORK_REPLACE_FLAG,
+    dictClass: 'string',
+  },
+  {
+    label: '返修人员',
+    field: 'reworkPersoncode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '返修时间',
+    field: 'reworkTime',
+    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: 'reworkResult',
+    sort: 'custom',
+    isSearch: true,
+  },
+  
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.REWORK_STATUS,
+    dictClass: 'string',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/reworkSingle/index.vue b/src/views/mes/reworkSingle/index.vue
index 2265bb135..3fe6a7eb8 100644
--- a/src/views/mes/reworkSingle/index.vue
+++ b/src/views/mes/reworkSingle/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -131,18 +131,38 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:reworkSingle:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:reworkSingle:delete'}), // 删除
-]
+const butttondata =  (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 编辑
+    defaultButtons.mainListSuspend1Btn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:delete'}), // 中止1
+    defaultButtons.mainListReceiveBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 领取
+    defaultButtons.mainListSuspend2Btn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:delete'}), // 中止2
+    defaultButtons.mainListFinishBtn({hide: isShowMainButton(row,['2']),hasPermi:'mes:reworkSingle:update'}), // 完成
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+  } else if (val == 'suspend') { // 中止1
+    handleSuspend(row.id)
+  } else if (val == 'receive') { // 领取
+    handleReceive(row.id)
+  } else if (val == 'suspend') { // 中止2
+    handleSuspend(row.id)
+  } else if (val == 'finish') { // 完成
+    handleFinish(row.id)
   }
 }
 
@@ -209,6 +229,46 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 中止按钮操作 */
+const handleSuspend = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否中止所选中任务？');
+    // 发起删除
+    await ReworkSingleApi.suspendReworkSingle(id)
+    message.success(t('中止成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 领取按钮操作 */
+const handleReceive = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否领取所选中任务？');
+    // 发起删除
+    await ReworkSingleApi.receiveReworkSingle(id)
+    message.success(t('领取成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 完成按钮操作 */
+const handleFinish = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否完成所选中任务？');
+    // 发起删除
+    await ReworkSingleApi.finishReworkSingle(id)
+    message.success(t('任务已完成'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
diff --git a/src/views/mes/workstation/components/Detail.vue b/src/views/mes/workstation/components/Detail.vue
index 81dc468ec..d950d28da 100644
--- a/src/views/mes/workstation/components/Detail.vue
+++ b/src/views/mes/workstation/components/Detail.vue
@@ -138,6 +138,8 @@
       @onBlur="onBlur"
       @formFormDateChange="formFormDateChange"
     />
+    <!-- 表格弹窗 -->
+    <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
 
   </div>
 </template>
@@ -299,7 +301,18 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
-  }
+  },
+  //是否直接展示搜索表单
+  isOpenSearchTable:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  searchTableSchema: {
+    type: Array,
+    required: false,
+    default: null
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -381,6 +394,79 @@ const HeadButttondata = ref()
 // 列表-操作按钮
 const buttondata = ref()
 
+
+/** isOpenSearchTable 对应 表格弹窗 */
+const initModel = (schema: FormSchema[], formModel: Recordable) => {
+  const model: Recordable = { ...formModel }
+  schema.map((v) => {
+    // 如果是hidden，就删除对应的值
+    if (v.hidden) {
+      delete model[v.field]
+    } else if (v.component && v.component !== 'Divider') {
+      const hasField = Reflect.has(model, v.field)
+      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
+      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
+    }
+  })
+  return model
+}
+const searchTableRef = ref()
+const searchTableFormModel = ref<Recordable>({})
+if(props.isOpenSearchTable){
+  searchTableFormModel.value = initModel(props.searchTableSchema.formSchema, unref(searchTableFormModel))
+}
+const searchTableFormType = ref('') // 表单的类型：create - 新增；update - 修改
+
+
+// 直接打开表格数据 --> 对应：isOpenSearchTable === true
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    for (var i=0; i< searchCondition.length; i++ ) {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = detailData
+          ? detailData.value[searchCondition[i].value]
+          : ''
+      }else{
+        _searchCondition[searchCondition[i].key] = searchCondition[i].value
+      }
+    }
+  }
+  console.log(searchCondition)
+  console.log(_searchCondition)
+  searchTableRef.value.open(
+    searchTitle,
+    searchAllSchemas,
+    searchPage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+const searchTableSuccess1 = (formField, searchField, val, formRef) => {
+  console.log('searchTableSuccess1',val)
+  searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',')
+  console.log('searchTableSuccess1',searchTableFormModel)
+  submitForm(searchTableFormType.value,searchTableFormModel.value)
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+
 /** 打开弹窗 */
 const formRef = ref()
 const titleNameRef = ref()
@@ -512,7 +598,22 @@ const { getList } = tableMethodsRef.value
 const buttonBaseClick = (val, item) => {
   if (val == 'add') {
     // 新增
-    openForm('create')
+    if(props.isOpenSearchTable){
+      searchTableFormType.value = 'create'
+      // 如果需要直接打开表格数据
+      const item = props.searchTableSchema.formSchema[0]
+      opensearchTable(
+          item.field, item?.componentProps?.searchField,
+          item?.componentProps?.searchTitle, 
+          item?.componentProps?.searchAllSchemas, 
+          item?.componentProps?.searchPage,
+          item?.componentProps?.searchCondition,
+          item?.componentProps?.multiple,
+          undefined,undefined
+      )
+    }else{
+      openForm('create')
+    }
   } else if (val == 'import') {
     // 导入
     handleImport()
@@ -559,7 +660,7 @@ const submitForm = async (formType, data) => {
     const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
     if (!rs) return
     if (formType === 'create') {
-      await props.apiCreate(data)
+      await props.apiCreate(data.list.split(","))
       message.success(t('common.createSuccess'))
     } else {
       await props.apiUpdate(data)
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 8c3be7b0c..327d30923 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -52,22 +52,25 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef"
-          :isBasic="false"
-          :allSchemas="Workstation.allSchemas"
-          :detailAllSchemas="detailAllSchemas"
-          :detailAllSchemasRules="WorkstationRules"
-          :apiPage="apiPage"
-          :tabs="TabsList"
-          :apiDelete=tabsDeleteApi
-          @changeTabs="changeTabs"
-          :detailButtonIsShowAdd="true"
-          :detailButtonIsShowDelete="true"
-          :detailButtonIsShowEdit="false"
-          @detailOpenForm="detailOpenForm"
+    :isBasic="false"
+    :isOpenSearchTable="true"
+    :apiCreate="tabsCreateApi"
+    :apiDelete="tabsDeleteApi"
+    :allSchemas="Workstation.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :searchTableSchema="tmpPopList"
+    :detailAllSchemasRules="WorkstationRules"
+    :apiPage="apiPage"
+    :tabs="TabsList"
+    @changeTabs="changeTabs"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowEdit="false"
+    @detailOpenForm="detailOpenForm"
   />
   <BasicForm
     ref="teamListRef"
-    :formAllSchemas="popList.allSchemas"
+    :formAllSchemas="tmpPopList"
     :isBusiness="false"
   />
   <!-- 导入 -->
@@ -83,7 +86,7 @@ import {
   TabsList,
   Team,
   Workstation,
-  WorkstationRules, popList
+  WorkstationRules, teamPopList,equipmentPopList,processPopList,stepPopList
 } from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -95,9 +98,9 @@ import {
 import Detail from './components/Detail.vue'
 defineOptions({ name: 'Workstation' })
 let tabsDeleteApi = WorkstationApi.deleteTeamRelation
+let tabsCreateApi = WorkstationApi.createTeamRelation
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const teamRef = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -270,6 +273,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 const detailAllSchemas = ref(Team.allSchemas)
 const apiPage = ref(WorkstationApi.getTeamPage)
 const tableKey = ref("Team");
+let tmpPopList = teamPopList.allSchemas
 // tabs 切换事件
 const changeTabs = (data) =>{
   tableKey.value = data.prop
@@ -277,18 +281,26 @@ const changeTabs = (data) =>{
     apiPage.value = WorkstationApi.getTeamPage
     detailAllSchemas.value = Team.allSchemas
     tabsDeleteApi = WorkstationApi.deleteTeamRelation
+    tabsCreateApi = WorkstationApi.createTeamRelation
+    tmpPopList = teamPopList.allSchemas
   }else if(data.prop == 'Equipment'){
     apiPage.value = WorkstationApi.getEquipmentPage
     detailAllSchemas.value = Equipment.allSchemas
     tabsDeleteApi = WorkstationApi.deleteEquipmentRelation
+    tabsCreateApi = WorkstationApi.createEquipmentRelation
+    tmpPopList = equipmentPopList.allSchemas
   }else if(data.prop == 'Process'){
     apiPage.value = WorkstationApi.getProcessPage
     detailAllSchemas.value = Process.allSchemas
     tabsDeleteApi = WorkstationApi.deleteProcessRelation
+    tabsCreateApi = WorkstationApi.createProcessRelation
+    tmpPopList = processPopList.allSchemas
   }else if(data.prop == 'Opersteps'){
     apiPage.value = WorkstationApi.getOperstepsPage
     detailAllSchemas.value = Opersteps.allSchemas
     tabsDeleteApi = WorkstationApi.deleteOperstepsRelation
+    tabsCreateApi = WorkstationApi.createOperstepsRelation
+    tmpPopList = stepPopList.allSchemas
   }
 }
 const teamListRef = ref()
diff --git a/src/views/mes/workstation/mesOrderMonthMain.data.ts b/src/views/mes/workstation/mesOrderMonthMain.data.ts
new file mode 100644
index 000000000..d766ae00a
--- /dev/null
+++ b/src/views/mes/workstation/mesOrderMonthMain.data.ts
@@ -0,0 +1,83 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthMainRules = reactive({
+})
+
+export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    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: '创建者用户名',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '工厂名称',
+    field: 'factoryName',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index e5ac54c59..60e3aa682 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -1,10 +1,19 @@
 import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
 import {dateFormatter} from '@/utils/formatTime'
 import * as WorkstationApi from "@/api/mes/workstation";
+import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from "@/api/wms/workshop";
+import {
+  Productionline
+} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
+import * as ProductionlineApi from "@/api/wms/productionline";
 
 // 表单校验
 export const WorkstationRules = reactive({
-  code: [required]
+  code: [required],
+  name: [required],
+  workshopCode:[required],
+  productionLineCode: [required]
 })
 export const TabsList = [{
   label: "班组",
@@ -43,14 +52,52 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: true,
-    isForm: false
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
     isSearch: true,
-    isForm: false
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '班组代码',
@@ -95,6 +142,25 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -214,21 +280,96 @@ export const Opersteps = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:true,
   }
 ]))
-export const popList = useCrudSchemas(reactive<CrudSchema[]>([
+export const teamPopList = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '选择班组',
+    field: 'list',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择选择班组', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '选择班组', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.checkTeamPageList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  }
+]))
+export const equipmentPopList = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '选择设备',
+    field: 'list',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择设备', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '选择设备', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.checkEquipmentPageList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  }
+]))
+export const processPopList = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '选择工序',
+    field: 'list',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        multiple:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择工序', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '选择工序', // 查询弹窗标题
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.checkProcessPageList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  }
+]))
+export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '多选列表',
-    field: 'popCheckList',
+    label: '选择操作步骤',
+    field: 'list',
     sort: 'custom',
     isSearch: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        multiple:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchListPlaceholder: '选择操作步骤', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
+        searchTitle: '选择操作步骤', // 查询弹窗标题
         searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.getTeamPage, // 查询弹窗所需分页方法
+        searchPage: WorkstationApi.checkOperstepsPageList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
new file mode 100644
index 000000000..d20c0ba3d
--- /dev/null
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -0,0 +1,864 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
+    <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+      <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
+      <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="编码" prop="code">
+              <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="描述" prop="description">
+              <el-input v-model="data.description" placeholder="请填写描述" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本" prop="version">
+              <el-input v-model="data.version" placeholder="请填写版本" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-tabs
+        v-model="editableTabsValue"
+        editable
+        class="demo-tabs"
+        @edit="handleTabsEdit"
+        type="border-card"
+        tab-position="left"
+        :stretch="false"
+      >
+        <el-tab-pane
+          v-for="item in data.process"
+          :key="item.name"
+          :label="item.description"
+          :name="item.name"
+        >
+          <div class="small-title">检验工序</div>
+          <!-- <Form
+            :ref="`formRefProcess`+index"
+            :schema="formAllSchemasProcess"
+            :is-col="true"
+            labelWidth="150px"
+            :rules="rules"
+          /> -->
+          <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="编码" prop="code">
+                  <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="检验方案模板编码">
+                  <el-input
+                    v-model="item.inspectionCode"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="描述" prop="description">
+                  <el-input v-model="item.description" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="顺序号" prop="sequenceCode">
+                  <el-input v-model="item.sequenceCode" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="检验特性编码">
+                  <el-input
+                    v-model="item.inspectionCharCode"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div class="small-title">检验特性</div>
+          <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="编码">
+                  <el-input
+                    v-model="item.inspectionCharacteristicsBaseVO.code"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="检验方法编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                      disabled
+                      placeholder="请选择检验方法编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethodCode',
+                          null,
+                          '检验方法',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="采样过程编码"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                      disabled
+                      placeholder="请选择采样过程编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '采样过程编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethod',
+                          null,
+                          '动态修改规则编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="是否允许修改特征值"
+                  prop="inspectionCharacteristicsBaseVO.isCanUpdate"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    placeholder="请选择是否允许修改特征值"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="结果录入方式"
+                  prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
+                    placeholder="请选择结果录入方式"
+                  >
+                    <el-option
+                      v-for="dict in getStrDictOptions(
+                        DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                      )"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="特征类型" prop="inspectionCharacteristicsBaseVO.featureType">
+                  <!-- <el-input v-model="item.featureType" /> -->
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.featureType"
+                    placeholder="请选择特征类型"
+                    @change="changeFeatureType"
+                  >
+                    <el-option
+                      v-for="dict in getStrDictOptions(
+                        DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                      )"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                <el-form-item
+                  label="是否设定上限"
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                    placeholder="请选择是否设定上限"
+                    @change="changeIsCapping"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="上限值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                  label="是否设定下限"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    placeholder="请选择是否设定下限"
+                    @change="changeLowlimit"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="下限值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                  label="是否设定目标值"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    placeholder="请选择是否设定目标值"
+                    @change="changeIsTarget"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="目标值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item
+                  label="计量单位"
+                  prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyUom" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="小数位"
+                  prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="选择集编码"
+                  prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                      disabled
+                      placeholder="请选择选择集编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'quantifyQuantifyCode',
+                          null,
+                          '选择集编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <template #footer>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+    </template>
+  </Dialog>
+  <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
+    <div style="padding: 0px 20px">
+      <el-form ref="nameRef" :model="nameForm">
+        <el-form-item
+          :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+          prop="name"
+        >
+          <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <template #footer>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
+    </template>
+  </Dialog>
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+</template>
+
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getCurrentInstance } from 'vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
+import { SearchTable } from '@/components/SearchTable'
+import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess'
+const message = useMessage() // 消息弹窗
+
+const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 检验特性表单，列表 相关信息
+  formAllSchemasFeatures: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验工序表单，列表 相关信息
+  formAllSchemasProcess: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 检验模板表单，列表 相关信息
+  formAllSchemasMain: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  }
+})
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogWidth = ref()
+const formMainRef = ref()
+const formFeaturesRef = ref()
+const formProcessRef = ref()
+
+const data = ref({
+  code: '',
+  description: '',
+  version: '',
+  process: []
+})
+const isYesList = [
+  {
+    value: true,
+    label: '是'
+  },
+  {
+    value: false,
+    label: '否'
+  }
+]
+const dialogVisibleName = ref(false)
+const nameForm = ref({
+  name: ''
+})
+const nameRef = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+const rules = ref({
+  description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  'inspectionCharacteristicsBaseVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.isCanUpdate': [
+    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
+    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
+    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
+    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
+    { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
+  ],
+
+  'inspectionCharacteristicsBaseVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ]
+})
+/** 打开弹窗 */
+let tabIndex = 1
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
+  dialogVisible.value = true
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  if (row) {
+    data.value = row
+    let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+    })
+    data.value.process = list
+  } else {
+    data.value = {
+      code: '',
+      description: '',
+      version: '',
+      process: []
+    }
+  }
+
+  tabIndex = data.value.process.length + 1
+}
+defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+import type { TabPaneName } from 'element-plus'
+
+const editableTabsValue = ref('1')
+// const editableTabs = ref([])
+
+const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
+  if (action === 'add') {
+    nameForm.value.name = ''
+    dialogVisibleName.value = true
+  } else if (action === 'remove') {
+    const tabs = data.value.process
+    let activeName = editableTabsValue.value
+    if (activeName === targetName) {
+      tabs.forEach((tab, index) => {
+        if (tab.name === targetName) {
+          const nextTab = tabs[index + 1] || tabs[index - 1]
+          if (nextTab) {
+            activeName = nextTab.name
+          }
+        }
+      })
+    }
+    editableTabsValue.value = activeName
+    data.value.process = tabs.filter((tab) => tab.name !== targetName)
+  }
+}
+/** 修改名称时间 */
+const buttonBaseClick1 = (val) => {
+  // 保存
+  if (val == 'save') {
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.process.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionCharacteristicsBaseVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
+        console.log(data.value.process)
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        console.log('error submit!')
+        return false
+      }
+    })
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisibleName.value = false
+  }
+}
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  // console.log(TableBaseForm_Ref.value)
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+const submitForm = async () => {
+  try {
+    const validateForm1 = await validateForm(formProcessRef.value)
+    console.log(validateForm1)
+    await formMainRef.value.validate()
+    if (!data.value.process || data.value.process.length == 0) {
+      message.error(`请添加工序`)
+      return;
+    }
+    const bol1 = await validateForm(formProcessRef.value)
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol1 || !bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return;
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data)
+    } else {
+      // 编辑
+      emit('submitForm', formType.value, data)
+    }
+  } catch {
+    console.log(111)
+  }
+}
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+} else {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+// 选择特征类型
+const changeFeatureType = (e) => {
+  console.log(e)
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  console.log(988, row)
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i = 0; i < searchCondition.length; i++) {
+      // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(
+            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          )
+          return
+        }
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value: searchCondition[i].value
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  console.log(row)
+  data.value.process.forEach((item) => {
+    if (item.description == row.description) {
+      item.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    }
+  })
+
+  // row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 选择是否设定上限值
+const changeIsCapping = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+  }
+}
+// 选择是否设定下限值
+const changeLowlimit = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+  }
+}
+// 选择是否设定目标值
+const changeIsTarget = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+  }
+}
+</script>
+<style scoped>
+.small-title {
+  font-weight: bold;
+  padding: 0px 10px 10px;
+  color: #1a8bfc;
+  font-size: 16px;
+}
+</style>
+<style>
+.el-tabs--left .el-tabs__header.is-left {
+  min-height: 700px !important;
+  min-width: 150px !important;
+}
+.el-tabs--left.el-tabs--border-card .el-tabs__item.is-left {
+  min-width: 120px !important;
+}
+</style>
diff --git a/src/views/qms/basicDataManage/inspectionPlan/index.vue b/src/views/qms/basicDataManage/inspectionPlan/index.vue
new file mode 100644
index 000000000..9699dd2a2
--- /dev/null
+++ b/src/views/qms/basicDataManage/inspectionPlan/index.vue
@@ -0,0 +1,197 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InspectionTemplateMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InspectionTemplateMain.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 #reqCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.reqCode)">
+          <span>{{ row.reqCode }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <AddForm
+    ref="basicFormRef"
+    basicFormWidth="80"
+    :formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
+    :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
+    :formAllSchemasMain="InspectionTemplateMain.allSchemas"
+    :rules="InspectionTemplateRules"
+    @submitForm="submitForm"
+  />
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="InspectionTemplateMain.allSchemas" 
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/agv-locationrelation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionPlan.data'
+
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import AddForm from './addForm.vue'
+import * as InspectionProcessPageApi from '@/api/qms/inspectionPlan'
+
+defineOptions({ name: 'AgvLocationrelation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InspectionTemplateMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InspectionProcessPageApi.inspectionTemplatePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation: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:'qms:inspectionTemplate:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionTemplate: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 submitForm = async (formType,data) => {
+  console.log(data.value)
+  if (formType === 'create') {
+    await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
+    message.success(t('common.createSuccess'))
+  } else {
+    await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
+    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, 'basicAgvLocationrelation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await InspectionProcessPageApi.inspectionTemplateDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+./inspectionPlan.data
\ No newline at end of file
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/agvLocationrelation.data.ts b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
similarity index 57%
rename from src/views/qms/basicDataManage/inspectionTemplate/agvLocationrelation.data.ts
rename to src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
index 9398a3fda..62e6c9f7c 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/agvLocationrelation.data.ts
+++ b/src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
@@ -1,157 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as AreaApi from '@/api/wms/areabasic'
-import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
-import * as LocationApi from '@/api/wms/location'
-import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
-import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
-let  inspectionProcessPage = await InspectionProcessPageApi.getInspectionProcessPage()
-inspectionProcessPage = inspectionProcessPage.list
 
 // 表单校验
-export const AgvLocationrelationRules = reactive({
-  positionCode: [
-    { required: true, message: '请填写AGV点位', trigger: 'change' }
-  ],
-  positionArea: [
-    { required: true, message: '请填写AGV库区', trigger: 'change' }
-  ],
-  wmsArea: [
-    { required: true, message: '请填写WMS库区', trigger: 'change' }
-  ],
-  wmsPosition: [
-    { required: true, message: '请填写WMS库位', trigger: 'change' }
-  ]
-})
 
-export const AgvLocationrelation = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'reqCode',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: 'AGV点位',
-    field: 'positionCode',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: 'AGV库区',
-    field: 'positionArea',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: 'WMS库区',
-    field: 'wmsArea',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库区信息', // 查询弹窗标题
-        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
-        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
-  {
-    label: 'WMS库位',
-    field: 'wmsPosition',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'areaCode',
-          value: "wmsArea",
-          message: '请选择库区代码！',
-          isMainValue: true
-        }]
-      }
-    }
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: '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')]
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    isDetail: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
 export const InspectionTemplateRules = reactive({
   description: [
     { required: true , message: '请填写描述', trigger: 'blur' }
@@ -237,6 +88,15 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '版本',
     field: 'version',
     sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
   }
 ]))
 export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
@@ -260,16 +120,6 @@ export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验方案模板编码',
     field: 'inspectionCode',
     sort: 'custom',
-    form:{
-      component:'Select',
-      api: () => inspectionProcessPage,
-      componentProps:{
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'id'
-        }
-      }
-    }
   },{
     label: '顺序号',
     field: 'sequenceCode',
@@ -277,16 +127,6 @@ export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验特性编码',
     field: 'inspectionCharCode',
     sort: 'custom',
-    form:{
-      component:'Select',
-      api: () => inspectionProcessPage,
-      componentProps:{
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'id'
-        }
-      }
-    }
   }
 ]))
 export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
@@ -309,44 +149,14 @@ export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
     label: '检验方法编码',
     field: 'inspectionMethodCode',
     sort: 'custom',
-    form:{
-      component:'Select',
-      api: () => inspectionProcessPage,
-      componentProps:{
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'id'
-        }
-      }
-    }
   },{
     label: '采样过程编码',
     field: 'dynamicUpdateCode',
     sort: 'custom',
-    form:{
-      component:'Select',
-      api: () => inspectionProcessPage,
-      componentProps:{
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'id'
-        }
-      }
-    }
   },{
     label: '动态修改规则编码',
     field: 'inspectionMethod',
     sort: 'custom',
-    form:{
-      component:'Select',
-      api: () => inspectionProcessPage,
-      componentProps:{
-        optionsAlias: {
-          labelField: 'description',
-          valueField: 'id'
-        }
-      }
-    }
   },{
     label: '是否允许修改特征值',
     field: 'isCanUpdate',
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index 930a4972b..555761be5 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -8,25 +8,25 @@
   >
     <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
       <!-- <Form ref="formRefMain" :schema="formAllSchemasMain" :is-col="true" :rules="rules" /> -->
-          <el-form :model="data" label-width="auto">
-            <el-row>
-      <el-col :span="12">
-                <el-form-item label="编码">
-                  <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true"/>
-                </el-form-item>
-              </el-col>
+      <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+        <el-row>
           <el-col :span="12">
-                <el-form-item label="描述">
-                  <el-input v-model="data.description"  placeholder="请填写描述"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="版本">
-                  <el-input v-model="data.version"  placeholder="请填写版本"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
+            <el-form-item label="编码" prop="code">
+              <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="描述" prop="description">
+              <el-input v-model="data.description" placeholder="请填写描述" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版本" prop="version">
+              <el-input v-model="data.version" placeholder="请填写版本" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <el-tabs
         v-model="editableTabsValue"
         editable
@@ -50,89 +50,168 @@
             labelWidth="150px"
             :rules="rules"
           /> -->
-          <el-form :model="item" label-width="auto">
+          <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-form-item label="编码">
-                  <el-input v-model="item.code"  placeholder="根据系统生成" :disabled="true"/>
+                <el-form-item label="编码" prop="code">
+                  <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="检验方案模板编码">
-                  <el-input v-model="item.inspectionCode"  placeholder="根据系统生成" :disabled="true"/>
+                  <el-input
+                    v-model="item.inspectionCode"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
                 </el-form-item>
-               
               </el-col>
               <el-col :span="12">
-                <el-form-item label="描述">
+                <el-form-item label="描述" prop="description">
                   <el-input v-model="item.description" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="顺序号">
+                <el-form-item label="顺序号" prop="sequenceCode">
                   <el-input v-model="item.sequenceCode" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="检验特性编码">
-                  <el-input v-model="item.inspectionCharCode"  placeholder="根据系统生成" :disabled="true"/>
+                  <el-input
+                    v-model="item.inspectionCharCode"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
                 </el-form-item>
-                 
               </el-col>
             </el-row>
           </el-form>
           <div class="small-title">检验特性</div>
-          <el-form :model="item" label-width="auto">
+          <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="编码">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.code"  placeholder="根据系统生成" :disabled="true"/>
+                  <el-input
+                    v-model="item.inspectionCharacteristicsBaseVO.code"
+                    placeholder="根据系统生成"
+                    :disabled="true"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="描述">
+                <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
                   <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="检验方法编码">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode" placeholder="请选择检验方法编码">
-                    <el-option
-                      v-for="item in inspectionProcessList"
-                      :key="item.id"
-                      :label="item.description"
-                      :value="item.id"
+                <el-form-item
+                  label="检验方法编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                      disabled
+                      placeholder="请选择检验方法编码"
                     />
-                  </el-select>
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethodCode',
+                          null,
+                          '检验方法',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="采样过程编码">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionProcessPage" placeholder="请选择采样过程编码">
-                    <el-option
-                      v-for="item in inspectionProcessList"
-                      :key="item.id"
-                      :label="item.description"
-                      :value="item.id"
+                <el-form-item
+                  label="采样过程编码"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                      disabled
+                      placeholder="请选择采样过程编码"
                     />
-                  </el-select>
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '采样过程编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="动态修改规则编码">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod" placeholder="请选择动态修改规则编码">
-                    <el-option
-                      v-for="item in inspectionProcessList"
-                      :key="item.id"
-                      :label="item.description"
-                      :value="item.id"
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
                     />
-                  </el-select>
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethod',
+                          null,
+                          '动态修改规则编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="是否允许修改特征值">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate" placeholder="请选择是否允许修改特征值">
+                <el-form-item
+                  label="是否允许修改特征值"
+                  prop="inspectionCharacteristicsBaseVO.isCanUpdate"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    placeholder="请选择是否允许修改特征值"
+                  >
                     <el-option
                       v-for="item in isYesList"
                       :key="item.value"
@@ -143,10 +222,18 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="结果录入方式">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod" placeholder="请选择结果录入方式">
+                <el-form-item
+                  label="结果录入方式"
+                  prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
+                    placeholder="请选择结果录入方式"
+                  >
                     <el-option
-                    v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY)"
+                      v-for="dict in getStrDictOptions(
+                        DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                      )"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -155,11 +242,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="特征类型">
+                <el-form-item label="特征类型" prop="inspectionCharacteristicsBaseVO.featureType">
                   <!-- <el-input v-model="item.featureType" /> -->
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.featureType" placeholder="请选择特征类型">
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.featureType"
+                    placeholder="请选择特征类型"
+                    @change="changeFeatureType"
+                  >
                     <el-option
-                    v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE)"
+                      v-for="dict in getStrDictOptions(
+                        DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                      )"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -168,9 +261,16 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="12">
-                <el-form-item label="是否设定上限">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping" placeholder="请选择是否设定上限">
+              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
+                <el-form-item
+                  label="是否设定上限"
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                    placeholder="请选择是否设定上限"
+                    @change="changeIsCapping"
+                  >
                     <el-option
                       v-for="item in isYesList"
                       :key="item.value"
@@ -181,8 +281,25 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="是否设定下限">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit" placeholder="请选择是否设定下限">
+                <el-form-item
+                  label="上限值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                  label="是否设定下限"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    placeholder="请选择是否设定下限"
+                    @change="changeLowlimit"
+                  >
                     <el-option
                       v-for="item in isYesList"
                       :key="item.value"
@@ -193,40 +310,94 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="目标值">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" />
+                <el-form-item
+                  label="下限值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="上限值">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" />
+                <el-form-item
+                  prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                  label="是否设定目标值"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-select
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    placeholder="请选择是否设定目标值"
+                    @change="changeIsTarget"
+                  >
+                    <el-option
+                      v-for="item in isYesList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="下限值">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" />
+                <el-form-item
+                  label="目标值"
+                  prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
+                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" />
                 </el-form-item>
               </el-col>
+
               <el-col :span="12">
-                <el-form-item label="计量单位">
+                <el-form-item
+                  label="计量单位"
+                  prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
                   <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyUom" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="小数位">
+                <el-form-item
+                  label="小数位"
+                  prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                >
                   <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="选择集编码">
-                  <el-select v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode" placeholder="请选择集编码">
-                    <el-option
-                      v-for="item in inspectionProcessList"
-                      :key="item.id"
-                      :label="item.description"
-                      :value="item.id"
+                <el-form-item
+                  label="选择集编码"
+                  prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                      disabled
+                      placeholder="请选择选择集编码"
                     />
-                  </el-select>
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'quantifyQuantifyCode',
+                          null,
+                          '选择集编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          null,
+                          false,
+                          null,
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -240,12 +411,20 @@
   </Dialog>
   <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
     <div style="padding: 0px 20px">
-      <el-input v-model="name" style="width: 240px" placeholder="请输入名称" />
+      <el-form ref="nameRef" :model="nameForm">
+        <el-form-item
+          :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+          prop="name"
+        >
+          <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
+        </el-form-item>
+      </el-form>
     </div>
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
     </template>
   </Dialog>
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -253,21 +432,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getCurrentInstance } from 'vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
-const inspectionProcessList = ref([])
-const isYesList = ref([])
-onMounted(async()=>{
-  let  inspectionProcessPage = await InspectionProcessPageApi.getInspectionProcessPage()
-inspectionProcessList.value = inspectionProcessPage.list
-console.log(inspectionProcessList)
+import { SearchTable } from '@/components/SearchTable'
+import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess'
+const message = useMessage() // 消息弹窗
 
-isYesList.value =[{
-        value:0,
-        label:'是'
-      },{
-        value:1,
-        label:'否'
-      }]
-})
 const props = defineProps({
   // 显示窗口宽度设置
   basicFormWidth: {
@@ -297,40 +466,106 @@ const props = defineProps({
     type: Array,
     required: false,
     default: null
-  },
-  // 校验rules
-  rules: {
-    type: Object,
-    required: true,
-    default: null
   }
 })
 const { t } = useI18n() // 国际化
 
-const dialogVisible = ref(true) // 弹窗的是否展示
+const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const dialogWidth = ref()
+const formMainRef = ref()
+const formFeaturesRef = ref()
+const formProcessRef = ref()
+
 const data = ref({
   code: '',
-  description:'',
-  version:'',
-  process:[]
+  description: '',
+  version: '',
+  process: []
 })
-
-
+const isYesList = [
+  {
+    value: true,
+    label: '是'
+  },
+  {
+    value: false,
+    label: '否'
+  }
+]
 const dialogVisibleName = ref(false)
-const name = ref('')
-const onSubmit = () => {
-  console.log('submit!')
-}
+const nameForm = ref({
+  name: ''
+})
+const nameRef = ref()
 if (props.basicFormWidth) {
   dialogWidth.value = props.basicFormWidth + '%'
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
+const rules = ref({
+  description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
+  version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
+  inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }],
+  sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
+  inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }],
+  'inspectionCharacteristicsBaseVO.description': [
+    { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.dynamicUpdateCode': [
+    { required: true, message: '请选择采样过程编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.inspectionMethod': [
+    { required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.isCanUpdate': [
+    { required: true, message: '请选择是否允许修改特征值', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.isDestructionInspection': [
+    { required: true, message: '请选择是否破坏性检验', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.resultEntryMethod': [
+    { required: true, message: '请选择结果录入方式', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.featureType': [
+    { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsCapping': [
+    { required: true, message: '请选择是否设定上限', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsLowlimit': [
+    { required: true, message: '请选择是否设定下限', trigger: ['blur', 'change'] }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyIsTarget': [
+    { required: true, message: '请选择是否设定目标值', trigger: ['blur', 'change'] }
+  ],
+
+  'inspectionCharacteristicsBaseVO.quantifyTarget': [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyCapping': [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyUom': [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyDecimal': [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ]
+})
 /** 打开弹窗 */
+let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
   dialogVisible.value = true
   if (titleName) {
@@ -338,17 +573,53 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   } else {
     dialogTitle.value = t('action.' + type)
   }
+  formType.value = type
+  if (row) {
+    data.value = row
+    
+    let list = await InspectionProcessPageApi.getListByTempleteCode(row.code)
+    list.forEach((item, index) => {
+      editableTabsValue.value = index + 1
+      item.name = index + 1
+      // 编辑判断上限下限目标值是否必填
+      if(item.quantifyIsCapping){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+      }
+      if(item.quantifyIsLowlimit){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+      }
+      if(item.quantifyIsTarget){
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+      }else{
+        rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+      }
+
+    })
+    data.value.process = list
+  } else {
+    data.value = {
+      code: '',
+      description: '',
+      version: '',
+      process: []
+    }
+  }
+
+  tabIndex = data.value.process.length + 1
 }
 defineExpose({ open, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
 import type { TabPaneName } from 'element-plus'
 
-let tabIndex = 1
 const editableTabsValue = ref('1')
 // const editableTabs = ref([])
 
 const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | 'add') => {
   if (action === 'add') {
-    name.value = ''
+    nameForm.value.name = ''
     dialogVisibleName.value = true
   } else if (action === 'remove') {
     const tabs = data.value.process
@@ -370,39 +641,46 @@ const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' |
 /** 修改名称时间 */
 const buttonBaseClick1 = (val) => {
   // 保存
-  console.log(val)
   if (val == 'save') {
-    const newTabName = `${++tabIndex}`
-    data.value.process.push({
-      description: name.value,
-      name: newTabName,
-      inspectionCode: '',
-      sequenceCode: '',
-      inspectionCharCode: '',
-      inspectionCharacteristicsBaseVO:{
-        describe: '',
-      inspectionMethodCode: '',
-      dynamicUpdateCode: '',
-      inspectionMethod: '',
-      isCanUpdate: '',
-      isDestructionInspection: '',
-      resultEntryMethod: '',
-      featureType: '',
-      quantifyIsCapping: '',
-      quantifyIsLowlimit: '',
-      quantifyTarget: '',
-      quantifyCapping: '',
-      quantifyLowlimit: '',
-      quantifyUom: '',
-      quantifyDecimal: '',
-      quantifyQuantifyCode: ''
+    if (!nameRef.value) return
+    nameRef.value.validate((valid, fields) => {
+      if (valid) {
+        const newTabName = `${++tabIndex}`
+        data.value.process.push({
+          description: nameForm.value.name,
+          name: newTabName,
+          inspectionCode: '',
+          sequenceCode: '',
+          inspectionCharCode: '',
+          inspectionCharacteristicsBaseVO: {
+            describe: '',
+            inspectionMethodCode: '',
+            dynamicUpdateCode: '',
+            inspectionMethod: '',
+            isCanUpdate: '',
+            isDestructionInspection: '',
+            resultEntryMethod: '',
+            featureType: '',
+            quantifyIsCapping: '',
+            quantifyIsLowlimit: '',
+            quantifyIsTarget: '',
+            quantifyTarget: '',
+            quantifyCapping: '',
+            quantifyLowlimit: '',
+            quantifyUom: '',
+            quantifyDecimal: '',
+            quantifyQuantifyCode: ''
+          }
+        })
+        console.log(data.value.process)
+
+        editableTabsValue.value = newTabName
+        dialogVisibleName.value = false
+      } else {
+        console.log('error submit!')
+        return false
       }
-     
     })
-    console.log(  data.value.process)
-
-    editableTabsValue.value = newTabName
-    dialogVisibleName.value = false
   }
   // 关闭
   else if (val == 'close') {
@@ -419,14 +697,52 @@ const buttonBaseClick = (val) => {
     dialogVisible.value = false
   }
 }
+// 传递给父类
+const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const validateForm = (formRef) => {
+  // console.log(TableBaseForm_Ref.value)
+  let _lists = formRef?.map((v) => v.validate())
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
+}
+
 const submitForm = async () => {
-  // const data1= unref(formRefMain)?.formModel
-  // const data2= unref(formRefProcess)?.formModel
-  // const data3= unref(formRefFeatures)?.formModel
-  // console.log(data1)
-  // console.log(data2)
-  console.log(data.list)
-        emit('submitForm', formType.value, data)
+  try {
+    const validateForm1 = await validateForm(formProcessRef.value)
+    console.log(validateForm1)
+    await formMainRef.value.validate()
+    if (!data.value.process || data.value.process.length == 0) {
+      message.error(`请添加工序`)
+      return;
+    }
+    const bol1 = await validateForm(formProcessRef.value)
+    const bol2 = await validateForm(formFeaturesRef.value)
+    if (!bol1 || !bol2) {
+      message.error(`模板中有检验工序和检验特性未填写完全`)
+      return;
+    }
+    const arr = data.value.process.filter(item=>(!item.inspectionCharacteristicsBaseVO.quantifyIsCapping&&!item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit&&!item.inspectionCharacteristicsBaseVO.quantifyIsTarget&&item.inspectionCharacteristicsBaseVO.featureType == 0))
+    console.log(arr)
+    if(arr&&arr.length>0){
+      const str = arr.map(item=>item.description).join(',')
+      message.error(`${str}是否设定上线,是否设定下限,是否是定目标值至少一项为是`)
+      return;
+    }
+    if (formType.value == 'create') {
+      // 主子表——提交请求
+      emit('submitForm', formType.value, data)
+    } else {
+      // 编辑
+      emit('submitForm', formType.value, data)
+    }
+  } catch {
+    console.log(111)
+  }
 }
 /** 弹窗按钮 */
 let Butttondata: any = []
@@ -438,6 +754,128 @@ if (props.footButttondata) {
     defaultButtons.formCloseBtn(null) // 关闭
   ]
 }
+// 选择特征类型
+const changeFeatureType = (e) => {
+  console.log(e)
+  // if (e) {
+  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = true
+  // } else {
+  //   rules.value['inspectionCharacteristicsBaseVO.quantifyQuantifyCode'][0].required = false
+  // }
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  console.log(988, row)
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i = 0; i < searchCondition.length; i++) {
+      // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(
+            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          )
+          return
+        }
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value: searchCondition[i].value
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(
+    _searchTableTitle,
+    _searchTableAllSchemas,
+    _searchTablePage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  console.log(row)
+  data.value.process.forEach((item) => {
+    if (item.description == row.description) {
+      item.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    }
+  })
+
+  // row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
+  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+// 选择是否设定上限值
+const changeIsCapping = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+  }
+}
+// 选择是否设定下限值
+const changeLowlimit = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+  }
+}
+// 选择是否设定目标值
+const changeIsTarget = (e) => {
+  if (e) {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+  } else {
+    rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+  }
+}
 </script>
 <style scoped>
 .small-title {
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/index.vue b/src/views/qms/basicDataManage/inspectionTemplate/index.vue
index c01f9f9ba..2bf152d42 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/index.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="AgvLocationrelation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="InspectionTemplateMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,7 +11,7 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="AgvLocationrelation.allSchemas"
+      :allSchemas="InspectionTemplateMain.allSchemas"
     />
 
   <!-- 列表 -->
@@ -39,16 +39,6 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <!-- <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="AgvLocationrelationRules"
-    :formAllSchemas="AgvLocationrelation.allSchemas"
-    :apiUpdate="AgvLocationrelationApi.updateAgvLocationrelation"
-    :apiCreate="AgvLocationrelationApi.createAgvLocationrelation"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  /> -->
   <AddForm
     ref="basicFormRef"
     basicFormWidth="80"
@@ -56,12 +46,13 @@
     :formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
     :formAllSchemasMain="InspectionTemplateMain.allSchemas"
     :rules="InspectionTemplateRules"
+    @submitForm="submitForm"
   />
   <!-- 详情 -->
   <Detail 
     ref="detailRef" 
     :isBasic="true" 
-    :allSchemas="AgvLocationrelation.allSchemas" 
+    :allSchemas="InspectionTemplateMain.allSchemas" 
     />
 
   <!-- 导入 -->
@@ -70,13 +61,13 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { AgvLocationrelation,AgvLocationrelationRules,InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './agvLocationrelation.data'
-import * as AgvLocationrelationApi from '@/api/wms/agvLocationrelation'
+import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from './inspectionTemplate.data'
+
 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 AddForm from './addForm.vue'
+import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 
 defineOptions({ name: 'AgvLocationrelation' })
 
@@ -86,16 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(AgvLocationrelation.allSchemas.tableColumns)
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-  })
-}
+const tableColumns = ref(InspectionTemplateMain.allSchemas.tableColumns)
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -103,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: AgvLocationrelationApi.getAgvLocationrelationPage // 分页接口
+  getListApi: InspectionProcessPageApi.inspectionTemplatePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -112,8 +94,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:agv-locationrelation:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:agv-locationrelation:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -145,8 +127,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:agv-locationrelation:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:agv-locationrelation:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:inspectionTemplate:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:inspectionTemplate:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -165,23 +147,13 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =AgvLocationrelation.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;
+const submitForm = async (formType,data) => {
+  console.log(data.value)
   if (formType === 'create') {
-    await AgvLocationrelationApi.createAgvLocationrelation(data)
+    await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
     message.success(t('common.createSuccess'))
   } else {
-    await AgvLocationrelationApi.updateAgvLocationrelation(data)
+    await InspectionProcessPageApi.inspectionTemplateUpdate(data.value)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -200,43 +172,13 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await AgvLocationrelationApi.deleteAgvLocationrelation(id)
+    await InspectionProcessPageApi.inspectionTemplateDelete(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 AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
-    download.excel(data, 'AGV库位转换.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: 'AGV库位转换导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
 
 // 筛选提交
 const searchFormClick = (searchData) => {
@@ -250,7 +192,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await AgvLocationrelationApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
new file mode 100644
index 000000000..62e6c9f7c
--- /dev/null
+++ b/src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts
@@ -0,0 +1,287 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+
+export const InspectionTemplateRules = reactive({
+  description: [
+    { required: true , message: '请填写描述', trigger: 'blur' }
+  ],
+  version: [
+    { required: true , message: '请填写版本', trigger: 'blur' }
+  ],
+  inspectionCode: [
+    { required: true, message: '请选择检验方案模板编码', trigger: 'blur' }
+  ],
+  sequenceCode: [
+    { required: true, message: '请填写顺序号', trigger: 'blur' }
+  ],
+  inspectionCharCode: [
+    { required: true, message: '请选择检验特性编码', trigger: 'blur' }
+  ],
+  describe: [
+    { required: true, message: '请填写描述', trigger: 'blur' }
+  ],
+  inspectionMethodCode: [
+    { required: true, message: '请选择检验方法编码', trigger: 'blur' }
+  ],
+  dynamicUpdateCode: [
+    { required: true, message: '请选择采样过程编码', trigger: 'blur' }
+  ],
+  inspectionMethod: [
+    { required: true, message: '请选择动态修改规则编码', trigger: 'blur' }
+  ],
+  isCanUpdate: [
+    { required: true, message: '请选择是否允许修改特征值', trigger: 'blur' }
+  ],
+  isDestructionInspection: [
+    { required: true, message: '请选择是否破坏性检验', trigger: 'blur' }
+  ],
+  resultEntryMethod: [
+    { required: true, message: '请选择结果录入方式', trigger: 'blur' }
+  ],
+  featureType: [
+    { required: true, message: '请选择特征类型', trigger: 'blur' }
+  ],
+  quantifyIsCapping: [
+    { required: true, message: '请选择是否设定上限', trigger: 'blur' }
+  ],
+  quantifyIsLowlimit: [
+    { required: true, message: '请选择是否设定下限', trigger: 'blur' }
+  ],
+  quantifyTarget: [
+    { required: true, message: '请输入目标值', trigger: 'blur' }
+  ],
+  quantifyCapping: [
+    { required: true, message: '请输入上限值', trigger: 'blur' }
+  ],
+  quantifyLowlimit: [
+    { required: true, message: '请输入下限值', trigger: 'blur' }
+  ],
+  quantifyquantifyUomLowlimit: [
+    { required: true, message: '请选择计量单位', trigger: 'blur' }
+  ],
+  quantifyDecimal: [
+    { required: true, message: '请输入小数位', trigger: 'blur' }
+  ],
+  quantifyQuantifyCode: [
+    { required: true, message: '请输入选择集编码', trigger: 'blur' }
+  ],
+})
+export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+  },{
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+export const InspectionTemplateProcess = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    isForm:false
+  },{
+    label: '检验方案模板编码',
+    field: 'inspectionCode',
+    sort: 'custom',
+  },{
+    label: '顺序号',
+    field: 'sequenceCode',
+  },{
+    label: '检验特性编码',
+    field: 'inspectionCharCode',
+    sort: 'custom',
+  }
+]))
+export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编码',
+    field: 'code',
+    sort: 'custom',
+    form:{
+      componentProps:{
+        disabled:true,
+        placeholder:'系统自动获取'
+      }
+    }
+  },
+  {
+    label: '描述',
+    field: 'describe',
+    sort: 'custom',
+  },{
+    label: '检验方法编码',
+    field: 'inspectionMethodCode',
+    sort: 'custom',
+  },{
+    label: '采样过程编码',
+    field: 'dynamicUpdateCode',
+    sort: 'custom',
+  },{
+    label: '动态修改规则编码',
+    field: 'inspectionMethod',
+    sort: 'custom',
+  },{
+    label: '是否允许修改特征值',
+    field: 'isCanUpdate',
+    sort: 'custom',
+    
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '是否破坏性检验',
+    field: 'isDestructionInspection',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '结果录入方式',
+    field: 'resultEntryMethod',
+    sort: 'custom',
+    dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },{
+    label: '特征类型',
+    field: 'featureType',
+    sort: 'custom',
+    dictType: DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+  },{
+    label: '是否设定上限',
+    field: 'quantifyIsCapping',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '是否设定下限',
+    field: 'quantifyIsLowlimit',
+    sort: 'custom',
+    form:{
+      component:'Select',
+      api: () => [{
+        value:0,
+        label:'是'
+      },{
+        value:1,
+        label:'否'
+      }],
+      componentProps:{
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        }
+      }
+    }
+  },{
+    label: '目标值',
+    field: 'quantifyTarget',
+    sort: 'custom',
+  },{
+    label: '上限值',
+    field: 'quantifyCapping',
+    sort: 'custom',
+  },{
+    label: '下限值',
+    field: 'quantifyLowlimit',
+    sort: 'custom',
+  },{
+    label: '计量单位',
+    field: 'quantifyUom',
+    sort: 'custom',
+  },{
+    label: '小数位',
+    field: 'quantifyDecimal',
+    sort: 'custom',
+  },{
+    label: '选择集编码',
+    field: 'quantifyQuantifyCode',
+    sort: 'custom',
+    form:{
+      component:'Select'
+    }
+  }
+]))
\ No newline at end of file
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index bc328bf0e..0c31d4587 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:sampleCode:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:sampleCode:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:sampleCode:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sampleCode:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sampleCode:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sampleCode:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:sampleCode:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:sampleCode:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:sampleCode:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:sampleCode:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index cc6e9ed6d..a17eff756 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -24,7 +24,7 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '批量下限',
-    field: 'batchLow limiting',
+    field: 'batchLowLimiting',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -81,6 +81,11 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index b5108d12f..0d7add0be 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -99,10 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:samplingProcess:create'}), // 新增
-  defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:samplingProcess:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:samplingProcess:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingProcess:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingProcess:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingProcess:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -134,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:samplingProcess:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:samplingProcess:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:samplingProcess:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:samplingProcess:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index a805e2a01..f9e28f4cf 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -64,6 +64,11 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index 547a9671a..9c2a9b8bc 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:samplingScheme:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:samplingScheme:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:samplingScheme:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingScheme:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingScheme:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingScheme:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:samplingScheme:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:samplingScheme:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'qms:samplingScheme:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'qms:samplingScheme:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index bc9feaf8d..77816682b 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -4,7 +4,7 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const SamplingSchemeRules = reactive({
   code: [required],
-  status: [required],
+  // status: [required],
   available: [required],
 })
 
@@ -28,19 +28,16 @@ export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+        form: {
+          component: 'SelectV2'
+        },
   },
   {
     label: '创建时间',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index ac0a5bd4d..d1af5fe63 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -28,6 +28,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm ref="formRef" 
     @success="getList" 
+    :isOpenSearchTable="true"
+    :indexTableColumn="1"
     :rules="PurchaseMainRules" 
     :formAllSchemas="PurchaseMain.allSchemas"
     :tableAllSchemas="PurchaseDetail.allSchemas" 
@@ -96,25 +98,39 @@
       if (type == 'tableForm') {
         // 明细查询页赋值
         if(formField == 'itemCode'){
-          let subList = tableData.value
-          let flag = false;
-          if(subList.length > 0){
-            subList.forEach((item) => {
-              if(item.itemCode == val[0]['itemCode']){
-                flag = true;
+          const repeatCode = [] //重复数据
+          if(tableData.value.length > 0){
+            tableData.value.forEach((item) => {
+              const findIndex = val.findIndex(valItem=>valItem['itemCode']==item.itemCode) 
+              if(findIndex > -1){
+                val.splice(findIndex,1)
+                repeatCode.push(item.itemCode)
               }
             })
           }
-          if(flag){
-            message.warning("物料代码已经存在");
-            return;
+          if(repeatCode.length>0){
+            message.warning(`物料代码${repeatCode.join(',')}已经存在`);
           }
-          row[formField] = val[0][searchField]
-          await ItembasicApi.getItembasicPage({
-            code: row['itemCode']
-          }).then(res => {
-            row['uom'] = res.list[0].uom
-          })
+          if(val.length>0){
+            val.forEach(item=>{
+              const newRow = {...row}
+              newRow[formField] = item[searchField]
+              let lineNumber = 1
+              if(tableData.value.length>0){
+                lineNumber = 1+(tableData.value[tableData.value.length-1]['lineNumber'])
+              }
+              newRow['lineNumber'] = lineNumber
+              newRow['uom'] = item['supplierUom']
+              tableData.value.push(newRow)
+            })
+            const itemCodes = val.map(valItem=>valItem['itemCode'])
+            await ItembasicApi.getItembasicPage({
+              code: itemCodes.join(',')
+            }).then(res => {
+              row['uom'] = res.list[0].uom
+            })
+          }
+          
         }
       } else {
         const setV = {}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 023d6051e..5f3eeed5e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -390,6 +390,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       isSearchList: true, // 开启查询弹窗
     }
   },
@@ -400,6 +401,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      multiple:true,//多选
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商物料',
       searchField: 'itemCode',
@@ -848,9 +850,9 @@ export const PurchaseDetailRules = reactive({
   orderQty:  [
     { required: true, message: '请输入订单数量', trigger: 'blur' }
   ],
-  uom:  [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
+  // uom:  [
+  //   { required: true, message: '请选择计量单位', trigger: 'change' }
+  // ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],