Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

6 months ago · 4518466b90
33 changed files with 2214 additions and 35 deletions
--- a/src/api/eam/classTypeRole/index.ts
+++ b/src/api/eam/classTypeRole/index.ts
@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface ClassTypeRoleVO {
+  id: number
+  workerRoleId: string
+  engineerRoleId: string
+  type: string
+  factoryAreaCode: string
+  workshopCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询厂区班组角色维护列表
+export const getClassTypeRolePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic/class-type-role/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic/class-type-role/page`, params })
+  }
+}
+
+// 查询厂区班组角色维护详情
+export const getClassTypeRole = async (id: number) => {
+  return await request.get({ url: `/eam/basic/class-type-role/get?id=` + id })
+}
+
+// 新增厂区班组角色维护
+export const createClassTypeRole = async (data: ClassTypeRoleVO) => {
+  return await request.post({ url: `/eam/basic/class-type-role/create`, data })
+}
+
+// 修改厂区班组角色维护
+export const updateClassTypeRole = async (data: ClassTypeRoleVO) => {
+  return await request.put({ url: `/eam/basic/class-type-role/update`, data })
+}
+
+// 删除厂区班组角色维护
+export const deleteClassTypeRole = async (id: number) => {
+  return await request.delete({ url: `/eam/basic/class-type-role/delete?id=` + id })
+}
+
+// 导出厂区班组角色维护 Excel
+export const exportClassTypeRole = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.downloadPost({ url: `/eam/basic/class-type-role/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/eam/basic/class-type-role/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic/class-type-role/get-import-template' })
+}
--- a/src/api/eam/basicDocumentType/index.ts
+++ b/src/api/eam/basicDocumentType/index.ts
@ -20,48 +20,48 @@ export const getDocumentTypePage = async (params) => {
  if (params.isSearch) {
    delete params.isSearch
    const data = {...params}
-    return await request.post({ url: '/eam/document-type/senior', data })
+    return await request.post({ url: '/eam/basic/document-type/senior', data })
  } else {
-    return await request.get({ url: `/eam/document-type/page`, params })
+    return await request.get({ url: `/eam/basic/document-type/page`, params })
  }
 }

 // 查询文档类型详情
 export const getDocumentType = async (id: number) => {
-  return await request.get({ url: `/eam/document-type/get?id=` + id })
+  return await request.get({ url: `/eam/basic/document-type/get?id=` + id })
 }

 // 新增文档类型
 export const createDocumentType = async (data: DocumentTypeVO) => {
-  return await request.post({ url: `/eam/document-type/create`, data })
+  return await request.post({ url: `/eam/basic/document-type/create`, data })
 }

 // 修改文档类型
 export const updateDocumentType = async (data: DocumentTypeVO) => {
-  return await request.put({ url: `/eam/document-type/update`, data })
+  return await request.put({ url: `/eam/basic/document-type/update`, data })
 }

 // 删除文档类型
 export const deleteDocumentType = async (id: number) => {
-  return await request.delete({ url: `/eam/document-type/delete?id=` + id })
+  return await request.delete({ url: `/eam/basic/document-type/delete?id=` + id })
 }

 // 导出文档类型 Excel
 export const exportDocumentType = async (params) => {
  if (params.isSearch) {
    const data = {...params}
-    return await request.downloadPost({ url: `/eam/document-type/export-excel-senior`, data })
+    return await request.downloadPost({ url: `/eam/basic/document-type/export-excel-senior`, data })
  }else{
-    return await request.download({ url: `/eam/document-type/export-excel`, params })
+    return await request.download({ url: `/eam/basic/document-type/export-excel`, params })
  }
 }

 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/eam/document-type/get-import-template' })
+  return request.download({ url: '/eam/basic/document-type/get-import-template' })
 }

 // 启用 / 禁用
 export const updateEnableCode = async (data: DocumentTypeVO) => {
-  return await request.post({ url: `/eam/document-type/ables` , data })
+  return await request.post({ url: `/eam/basic/document-type/ables` , data })
 }
--- a/src/api/eam/documentTypeSelectSet/index.ts
+++ b/src/api/eam/documentTypeSelectSet/index.ts
@ -0,0 +1,61 @@
+import request from '@/config/axios'
+import {BasicSpotCheckSelectSetVO} from "@/api/eam/basicSpotCheckSelectSet";
+
+export interface DocumentTypeSelectSetVO {
+  id: number
+  name: string
+  itemCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询文档类型选择集列表
+export const getDocumentTypeSelectSetPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/document-type-select-set/senior', data })
+  } else {
+    return await request.get({ url: `/eam/document-type-select-set/page`, params })
+  }
+}
+
+// 查询文档类型选择集详情
+export const getDocumentTypeSelectSet = async (id: number) => {
+  return await request.get({ url: `/eam/document-type-select-set/get?id=` + id })
+}
+
+// 新增文档类型选择集
+export const createDocumentTypeSelectSet = async (data: DocumentTypeSelectSetVO) => {
+  return await request.post({ url: `/eam/document-type-select-set/create`, data })
+}
+
+// 修改文档类型选择集
+export const updateDocumentTypeSelectSet = async (data: DocumentTypeSelectSetVO) => {
+  return await request.put({ url: `/eam/document-type-select-set/update`, data })
+}
+
+// 删除文档类型选择集
+export const deleteDocumentTypeSelectSet = async (id: number) => {
+  return await request.delete({ url: `/eam/document-type-select-set/delete?id=` + id })
+}
+
+// 导出文档类型选择集 Excel
+export const exportDocumentTypeSelectSet = async (params) => {
+  return await request.download({ url: `/eam/document-type-select-set/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/document-type-select-set/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: DocumentTypeSelectSetVO) => {
+  return await request.post({ url: `/eam/document-type-select-set/ables` , data })
+}
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@ -59,3 +59,8 @@ export const exportRole = (params) => {
    params
  })
 }
+
+// 查询角色列表
+export const getRoleNoPage = async (params: PageParam) => {
+  return await request.get({ url: '/system/role/noPage', params })
+}
--- a/src/api/wms/relegateRecordDetail/index.ts
+++ b/src/api/wms/relegateRecordDetail/index.ts
@ -0,0 +1,74 @@
+import request from '@/config/axios'
+
+export interface RelegateRecordDetailVO {
+  id: number
+  masterId: number
+  itemCode: string
+  downItemCode: string
+  businessType: string
+  uom: string
+  qty: number
+  inventoryStatus: string
+  fromBatch: string
+  fromPackingNumber: string
+  fromLocationCode: string
+  fromAreaTypes: string
+  fromAreaCodes: string
+  toPackingNumber: string
+  toBatch: string
+  toLocationCode: string
+  toWarehouseCode: string
+  toAreaTypes: string
+  toAreaCodes: string
+  number: string
+  available: string
+  remark: string
+  departmentCode: string
+  siteId: number
+  extraProperties: string
+  status: string
+  concurrencyStamp: number
+  serialNumber: string
+  ruleUserId: number
+}
+
+// 查询物料降级记录子列表
+export const getRelegateRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/relegate-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/relegate-record-detail/page`, params })
+  }
+}
+
+// 查询物料降级记录子详情
+export const getRelegateRecordDetail = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-record-detail/get?id=` + id })
+}
+
+// 新增物料降级记录子
+export const createRelegateRecordDetail = async (data: RelegateRecordDetailVO) => {
+  return await request.post({ url: `/wms/relegate-record-detail/create`, data })
+}
+
+// 修改物料降级记录子
+export const updateRelegateRecordDetail = async (data: RelegateRecordDetailVO) => {
+  return await request.put({ url: `/wms/relegate-record-detail/update`, data })
+}
+
+// 删除物料降级记录子
+export const deleteRelegateRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-record-detail/delete?id=` + id })
+}
+
+// 导出物料降级记录子 Excel
+export const exportRelegateRecordDetail = async (params) => {
+  return await request.download({ url: `/wms/relegate-record-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/relegate-record-detail/get-import-template' })
+}
--- a/src/api/wms/relegateRecordMain/index.ts
+++ b/src/api/wms/relegateRecordMain/index.ts
@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface RelegateRecordMainVO {
+  id: number
+  requestNumber: string
+  executeTime: Date
+  activeDate: Date
+  available: string
+  requestTime: Date
+  dueTime: Date
+  departmentCode: string
+  userGroupCode: string
+  interfaceType: string
+  code: string
+  number: string
+  businessType: string
+  remark: string
+  extraProperties: string
+  siteId: string
+}
+
+// 查询物料降级记录主列表
+export const getRelegateRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/relegate-record-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/relegate-record-main/page`, params })
+  }
+}
+
+// 查询物料降级记录主详情
+export const getRelegateRecordMain = async (id: number) => {
+  return await request.get({ url: `/wms/relegate-record-main/get?id=` + id })
+}
+
+// 新增物料降级记录主
+export const createRelegateRecordMain = async (data: RelegateRecordMainVO) => {
+  return await request.post({ url: `/wms/relegate-record-main/create`, data })
+}
+
+// 修改物料降级记录主
+export const updateRelegateRecordMain = async (data: RelegateRecordMainVO) => {
+  return await request.put({ url: `/wms/relegate-record-main/update`, data })
+}
+
+// 删除物料降级记录主
+export const deleteRelegateRecordMain = async (id: number) => {
+  return await request.delete({ url: `/wms/relegate-record-main/delete?id=` + id })
+}
+
+// 导出物料降级记录主 Excel
+export const exportRelegateRecordMain = async (params) => {
+  return await request.download({ url: `/wms/relegate-record-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/relegate-record-main/get-import-template' })
+}
--- a/src/api/wms/relegateRequestMain/index.ts
+++ b/src/api/wms/relegateRequestMain/index.ts
@ -65,4 +65,34 @@ export const exportRelegateRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/relegate-request-main/get-import-template' })
+}
+
+// 关闭
+export const close = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/close?id=' + id })
+}
+
+// 重新添加
+export const reAdd = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/reAdd?id=' + id })
+}
+
+// 提交审批
+export const submit = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/submit?id=' + id })
+}
+
+// 驳回
+export const refused = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/refused?id=' + id })
+}
+
+// 审批通过
+export const agree = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/agree?id=' + id })
+}
+
+// 处理
+export const handle = (id) => {
+  return request.put({ url: '/wms/relegate-request-main/handle?id=' + id })
 }
--- a/src/api/wms/supplierdeliverInspectionDetail/index.ts
+++ b/src/api/wms/supplierdeliverInspectionDetail/index.ts
@ -56,4 +56,8 @@ export const exportSupplierdeliverInspectionDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/supplierdeliver-inspection-detail/get-import-template' })
-}
+}
+// 查看质检报告
+export const queryQualityInspection =  (asnNumber:string) => {
+  return  request.get({ url: `/wms/supplierdeliver-request-main/queryQualityInspection?asnNumber=` + asnNumber })
+}
--- a/src/api/wms/workshop/index.ts
+++ b/src/api/wms/workshop/index.ts
@ -55,4 +55,9 @@ export const exportWorkshop = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/workshop/get-import-template' })
+}
+
+// 查询车间列表
+export const getWorkshopNoPage = async (params) => {
+  return await request.get({ url: `/wms/workshop/noPage`, params })
 }
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@ -4,7 +4,7 @@
    <div class="title flex items-center">
      <!-- <div class="title-txt">附件</div> -->
      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :title="t('ts.添加附件')" :upData="upData" :limit="10"
-        @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
+        @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/>
    </div>
    <div class="list">
      <div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">
@ -67,6 +67,10 @@ const props = defineProps({
    type: Boolean,
    required: false
  },
+  showAddBtn: {
+    type: Boolean,
+    required: true
+  },
 })
 // 子传父的时候需要先定义好emit这个方法
 const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess','previewAnnexHandle'])
--- a/src/config/axios/config.ts
+++ b/src/config/axios/config.ts
@ -16,7 +16,7 @@ const config: {
  /**
   * 接口请求超时时间
   */
-  request_timeout: 3000000,
+  request_timeout: 30000,

  /**
   * 默认接口请求类型
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@ -31,7 +31,7 @@ let requestList: any[] = []
 // 是否正在刷新中
 let isRefreshToken = false
 // 请求白名单，无须token的接口
-const whiteList: string[] = ['/login', '/refresh-token']
+const whiteList: string[] = ['/login', '/refresh-token','/queryQualityInspection']

 // 创建axios实例
 const service: AxiosInstance = axios.create({
--- a/src/permission.ts
+++ b/src/permission.ts
@ -21,7 +21,8 @@ const whiteList = [
  '/auth-redirect',
  '/bind',
  '/register',
-  '/oauthLogin/gitee'
+  '/oauthLogin/gitee',
+  '/purchasereceiptReport'
 ]

 // 路由加载前
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@ -244,6 +244,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
      noTagsView: true
    }
  },
+  {
+    path: '/purchasereceiptReport',
+    component: () => import('@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue'),
+    name: 'NoFound',
+    meta: {
+      hidden: true,
+      title: t('ts.查看质检报告'),
+      noTagsView: true
+    }
+  },
  {
    path: '/bpm',
    component: Layout,
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -341,5 +341,6 @@ export enum DICT_TYPE {
  // ========== eam - 业务 - ==========
  DEVICE_TYPE = 'device_type', // 设备类型
  IS_UPDATED = 'is_updated', //是否可修改
-
-}
+  DATA_SCOPE = 'data_scope', // 数据范围
+  ROLE_STATUS = 'role_status' // 角色状态
+}
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@ -518,6 +518,17 @@ export function mainListPlanUploadQualityReportBtn(option:any) {
    hasPermi: ''
  })
 }
+export function mainListPlanCheckQualityReportBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.查看质检报告`).replace('ts.', ''),
+    name: 'mainPlanCheckQualityReport',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}

 // 主列表-计划流程-提交审批按钮
 export function mainListPlanSubBtn(option:any) {
--- a/src/views/eam/classTypeRole/classTypeRole.data.ts
+++ b/src/views/eam/classTypeRole/classTypeRole.data.ts
@ -0,0 +1,191 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as deptApi from '@/api/system/dept'
+import * as roleApi from '@/api/system/role'
+import { Role } from '@/views/system/role/role.data'
+import { selectAllFactoryArea } from '@/api/system/dept'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+const roleList = await roleApi.getSimpleRoleList({})
+const workshopList = await WorkshopApi.getWorkshopPage({ pageNo: 1, pageSize: 100 })
+const roleListNoPage = await roleApi.getRoleNoPage({})
+const workshopNoPage = await WorkshopApi.getWorkshopNoPage({ pageNo: 1, pageSize: 100 })
+// 表单校验
+export const ClassTypeRoleRules = reactive({
+  workerRoleId: [required],
+  engineerRoleId: [required],
+  workerRoleName: [required],
+  engineerRoleName: [required],
+  workshopName: [required],
+  type: [required],
+  factoryAreaCode: [required],
+  concurrencyStamp: [required]
+})
+
+export const ClassTypeRole = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '维修工角色',
+    field: 'workerRoleId',
+    sort: 'custom',
+    isSearch: true,
+    isDetail: false,
+    isForm: false,
+    isTable: true,
+    isTableForm: false,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: roleListNoPage,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return roleList.find((item) => item.id == cellValue)?.name
+    },
+  },
+  {
+    label: '维修工角色',
+    field: 'workerRoleName',
+    sort: 'custom',
+    isTable: false,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择角色', // 输入框占位文本
+        searchField: 'id', // 查询弹窗赋值字段
+        searchTitle: '维修工角色', // 查询弹窗标题
+        searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
+        searchPage: roleApi.getRolePage, // 查询弹窗所需分页方法
+        searchCondition: []
+      }
+    },
+  },
+  {
+    label: '工程师角色',
+    field: 'engineerRoleId',
+    sort: 'custom',
+    isSearch: true,
+    isDetail: false,
+    isForm: false,
+    isTable: true,
+    isTableForm: false,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: roleListNoPage,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return roleList.find((item) => item.id == cellValue)?.name
+    },
+  },
+  {
+    label: '工程师角色',
+    field: 'engineerRoleName',
+    sort: 'custom',
+    isTable: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择角色', // 输入框占位文本
+        searchField: 'id', // 查询弹窗赋值字段
+        searchTitle: '工程师角色', // 查询弹窗标题
+        searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
+        searchPage: roleApi.getRolePage, // 查询弹窗所需分页方法
+        searchCondition: []
+      }
+    },
+  },
+  {
+    label: '班组',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.BASIC_TEAM_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
+  {
+    label: '车间编号',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    isDetail: false,
+    isForm: false,
+    isTable: true,
+    isTableForm: false,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: workshopNoPage,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'code'
+        },
+        filterable: true,
+      }
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: string) => {
+      return workshopList.list.find((item) => item.code == cellValue)?.name
+    },
+  },
+  {
+    label: '车间编号',
+    field: 'workshopName',
+    sort: 'custom',
+    isTable: 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: 'remark',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
--- a/src/views/eam/classTypeRole/index.vue
+++ b/src/views/eam/classTypeRole/index.vue
@ -0,0 +1,264 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ClassTypeRole.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ClassTypeRole.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ClassTypeRoleRules"
+    :formAllSchemas="ClassTypeRole.allSchemas"
+    :apiUpdate="ClassTypeRoleApi.updateClassTypeRole"
+    :apiCreate="ClassTypeRoleApi.createClassTypeRole"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ClassTypeRole.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/class-type-role/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ClassTypeRole,ClassTypeRoleRules } from './classTypeRole.data'
+import * as ClassTypeRoleApi from '@/api/eam/classTypeRole'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import * as roleApi from '@/api/system/role'
+import { Role } from '@/views/system/role/role.data'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+
+defineOptions({ name: 'ClassTypeRole' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ClassTypeRole.allSchemas.tableColumns)
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'workerRoleName'){
+      setV['workerRoleName'] = val[0]['name']
+      setV['workerRoleId'] = val[0][searchField]
+    }else if(formField == 'engineerRoleName'){
+      setV['engineerRoleName'] = val[0]['name']
+      setV['engineerRoleId'] = val[0][searchField]
+    }else if(formField == 'workshopName'){
+      setV['workshopName'] = val[0]['name']
+      setV['workshopCode'] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ClassTypeRoleApi.getClassTypeRolePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:class-type-role:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:class-type-role:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:class-type-role:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'eam:class-type-role:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:class-type-role:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = async (type: string, row?: any) => {
+  const roleList = await roleApi.getSimpleRoleList({})
+  const workshopList = await WorkshopApi.getWorkshopPage({ pageNo: 1, pageSize: 100 })
+  if(row != undefined){
+      row.workerRoleName = roleList.find(item => item.id == row.workerRoleId).name
+      row.engineerRoleName = roleList.find(item => item.id == row.engineerRoleId).name
+      row.workshopName = workshopList.list.find(item => item.code == row.workshopCode)?.name
+  }
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ClassTypeRole.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 ClassTypeRoleApi.createClassTypeRole(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ClassTypeRoleApi.updateClassTypeRole(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, 'basicClassTypeRole')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ClassTypeRoleApi.deleteClassTypeRole(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 ClassTypeRoleApi.exportClassTypeRole(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 ClassTypeRoleApi.importTemplate()
+})
+
+</script>
--- a/src/views/eam/basicDocumentType/basicDocumentType.data.ts
+++ b/src/views/eam/basicDocumentType/basicDocumentType.data.ts
--- a/src/views/eam/basicDocumentType/index.vue
+++ b/src/views/eam/basicDocumentType/index.vue
@ -59,8 +59,8 @@

 <script setup lang="ts">
 import download from '@/utils/download'
-import { DocumentType,DocumentTypeRules } from './basicDocumentType.data'
-import * as DocumentTypeApi from '@/api/eam/basicDocumentType'
+import { DocumentType,DocumentTypeRules } from './documentType.data'
+import * as DocumentTypeApi from '@/api/eam/documentType'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
--- a/src/views/eam/documentTypeSelectSet/documentTypeSelectSet.data.ts
+++ b/src/views/eam/documentTypeSelectSet/documentTypeSelectSet.data.ts
@ -0,0 +1,140 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const DocumentTypeSelectSetRules = reactive({
+  name: [required],
+  itemCode: [required],
+})
+
+export const DocumentTypeSelectSet = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '选择集名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '项编号',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
--- a/src/views/eam/documentTypeSelectSet/index.vue
+++ b/src/views/eam/documentTypeSelectSet/index.vue
@ -0,0 +1,300 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DocumentTypeSelectSet.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="DocumentTypeSelectSet.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 #name="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.name)">
+          <span>{{ row.name }}</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="DocumentTypeSelectSetRules"
+    :formAllSchemas="DocumentTypeSelectSet.allSchemas"
+    :apiUpdate="DocumentTypeSelectSetApi.updateDocumentTypeSelectSet"
+    :apiCreate="DocumentTypeSelectSetApi.createDocumentTypeSelectSet"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ItemForm ref="basicFormRef" @success="getData"/>
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="DocumentTypeSelectSet.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/document-type-select-set/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DocumentTypeSelectSet,DocumentTypeSelectSetRules } from './documentTypeSelectSet.data'
+import * as DocumentTypeSelectSetApi from '@/api/eam/documentTypeSelectSet'
+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 ItemForm from "@/views/eam/documentTypeSelectSet/itemSelectSetForm.vue";
+
+defineOptions({ name: 'DocumentTypeSelectSet' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(DocumentTypeSelectSet.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: DocumentTypeSelectSetApi.getDocumentTypeSelectSetPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:documentTypeSelectSet:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:documentTypeSelectSet:import'}), // 导入
+  //defaultButtons.defaultExportBtn({hasPermi:'eam:documentTypeSelectSet: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.available) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:documentTypeSelectSet:update'}), // 编辑
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:documentTypeSelectSet:update'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:documentTypeSelectSet:update'}),
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'enable') {
+    handleEnable(row.id)
+  } else if (val == 'disable') {
+    handleDisable(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =DocumentTypeSelectSet.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 DocumentTypeSelectSetApi.createDocumentTypeSelectSet(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await DocumentTypeSelectSetApi.updateDocumentTypeSelectSet(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+//刷新页面
+const getData = async() => {
+  getList();
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicDocumentTypeSelectSet')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DocumentTypeSelectSetApi.deleteDocumentTypeSelectSet(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 启用 */
+const handleEnable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'TRUE'
+    await DocumentTypeSelectSetApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 禁用 */
+const handleDisable = async (id: number) => {
+  try {
+    const params = ref({
+      id: '',
+      available:'',
+    })
+    params.value.id = id
+    params.value.available = 'FALSE'
+    await DocumentTypeSelectSetApi.updateEnableCode(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DocumentTypeSelectSetApi.exportDocumentTypeSelectSet(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 DocumentTypeSelectSetApi.importTemplate()
+})
+
+</script>
--- a/src/views/eam/documentTypeSelectSet/itemSelectSetForm.vue
+++ b/src/views/eam/documentTypeSelectSet/itemSelectSetForm.vue
@ -0,0 +1,292 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="basicFormRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="选择集名称" prop="name">
+            <el-input v-model="formData.name" placeholder="选择集名称" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="描述" prop="describing">
+            <el-input v-model="formData.describing" placeholder="描述" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="文档类型项" prop="items">
+            <div class="tag-container flex gap-2">
+              <el-tag v-for="ent in tags" :key="ent.code" closable :disable-transitions="false"  @close="handleClose(ent.id)">
+                {{ ent.code}}
+              </el-tag>
+              <el-input v-if="inputVisible" ref="InputRef" v-model="inputValue" class="w-20" size="small"/>
+              <el-button v-else class="button-new-tag" size="small" @click="addItem">
+                添加文档类型项 +
+              </el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+
+<!--添加文档类型项弹窗-->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+
+</template>
+<script lang="ts" setup>
+import * as SelectSetApi from '@/api/eam/documentTypeSelectSet'
+import request from "@/config/axios";
+import { SearchTable } from '@/components/SearchTable'
+import { DocumentType} from "@/views/eam/documentType/documentType.data";
+import * as documentTypeItemApi from "@/api/eam/documentType";
+import {ElInput} from "element-plus";
+import {
+  createDocumentTypeSelectSet,
+  DocumentTypeSelectSetVO, updateDocumentTypeSelectSet
+} from "@/api/eam/documentTypeSelectSet";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const tags=ref([])
+
+const inputValue = ref('')
+const inputVisible = ref(false)
+const isDisabled = ref(false)
+const InputRef = ref<InstanceType<typeof ElInput>>()
+
+const itemData = ref({
+  id: '',
+  code: ''
+})
+
+const formData = ref({
+  id: '',
+  name: '',
+  describing: '',
+  itemCode: '',
+  available: 'TRUE',
+  remark: '',
+  createTime: ''
+})
+const formRules = reactive({
+  name: [
+    { required: true, message: '选择集名称不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+/** 删除文档类型项 */
+const handleClose = (id: string) => {
+  const index = tags.value.findIndex(tag => tag.id === id);
+  if (index !== -1) {
+    tags.value.splice(index, 1);
+  }
+}
+
+/** 弹窗相关参数 */
+const searchTableRef = ref();
+const _searchTableTitle = ref();
+const _searchTableAllSchemas = ref();
+const _searchTablePage = ref();
+const _formField = ref();
+const _searchField = ref();
+const _multiple = ref();
+const _type = ref();
+const _row = ref();
+const _searchCondition = ref({})
+
+
+const addItem = () =>{
+  addItemCommon(true,'wenDangItem')
+}
+
+/** 选择文档类型项弹窗 */
+const addItemCommon = (multiple,field) => {
+  _searchCondition.value = {}
+  const filters: any[] = []
+  filters.push({
+    action: "==",
+    column: 'available',
+    value: 'TRUE'
+  })
+  // 参数整理
+  _searchCondition.value.isSearch = true
+  _searchCondition.value.filters = filters
+  _searchTableTitle.value = '选择文档类型项'
+  _multiple.value = multiple
+  _formField.value = field
+  _searchField.value = field
+  _searchTablePage.value = documentTypeItemApi.getDocumentTypePage
+  _searchTableAllSchemas.value = DocumentType.allSchemas
+  openCommon()
+}
+
+/** 弹窗选择之后  回调函数 添加选择集 */
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick?.(() => {
+      if (formField === 'wenDangItem') {
+          console.log(val)
+          val.forEach(item => {
+            const isExist = tags.value.some(tag => tag.code === item.code);
+            if (!isExist){
+              const newItem = {};
+              newItem['code'] = item.code;
+              newItem['id'] = item.id;
+              tags.value.push(newItem);
+            }
+          });
+      }
+  })
+}
+/*打开弹窗*/
+const openCommon = () => {
+  searchTableRef.value.open(
+    _searchTableTitle.value,
+    _searchTableAllSchemas.value,
+    _searchTablePage.value,
+    _formField.value,
+    _searchField.value,
+    _multiple.value,
+    _type.value,
+    _row.value,
+    _searchCondition.value
+  )
+}
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  // 修改时，设置数据
+  if (row) {
+    tags.value=[];
+    isDisabled.value = true;
+    formLoading.value = true
+    formData.value = row;
+    let item = (row.itemCode).split(",")
+    try {
+      for (var i = 0; i < item.length; i++) {
+        itemData.value = await request.get({ url: `/eam/basic/document-type/get?id=` + item[i] });
+        tags.value.push(itemData.value);
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 新增时
+  else {
+    resetForm()
+    isDisabled.value = false;
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!basicFormRef) return
+  const valid = await basicFormRef.value.validate()
+  if (!valid) return
+  if (tags.value.length > 10  ){
+    message.warning('文档类型项最多10个');
+    return
+  }
+
+  let result = '';
+  for (var i = 0; i < tags.value.length; i++) {
+    result += tags.value[i].id + ',';
+  }
+  if(result.endsWith(',')){
+    result = result.substring(0,result.length -1)
+  }
+  formData.value.itemCode = result
+  // 提交请求
+  formLoading.value = true
+  //formData.value.members = JSON.stringify(tags.value)
+  try {
+    const data = formData.value as unknown as SelectSetApi.DocumentTypeSelectSetVO
+    if (formType.value === 'create') {
+      await SelectSetApi.createDocumentTypeSelectSet(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SelectSetApi.updateDocumentTypeSelectSet(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    name: '',
+    describing: '',
+    itemCode: '',
+    available: 'TRUE',
+    remark: '',
+    createTime: ''
+  }
+  tags.value=[];
+  basicFormRef.value?.resetFields()
+}
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
--- a/src/views/eam/spotCheckItem/spotCheckItem.data.ts
+++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
@ -77,13 +77,13 @@ export const SpotCheckItem = useCrudSchemas(reactive<CrudSchema[]>([
    label: '是否启用',
    field: 'available',
    sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      isTable: true,
-      isDetail: false,
-      isSearch: false,
-      isTableForm: false,
-      isForm: false,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
  },
  {
    label: '备注',
--- a/src/views/system/role/role.data.ts
+++ b/src/views/system/role/role.data.ts
@ -0,0 +1,85 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RoleRules = reactive({
+  name: [required],
+  code: [required],
+})
+
+export const Role = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '角色ID',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '角色名称',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '角色权限字符串',
+    field: 'code',
+    sort: 'custom',
+    width: 200,
+  },
+  {
+    label: '显示顺序',
+    field: 'sort',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '数据权限范围',
+    field: 'dataScope',
+    sort: 'custom',
+    dictType: DICT_TYPE.DATA_SCOPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    width: 200,
+  },
+  {
+    label: '数据部门范围',
+    field: 'dataScopeDeptIds',
+    sort: 'custom',
+  },
+  {
+    label: '角色状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ROLE_STATUS,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
+  {
+    label: '角色类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.SYSTEM_ROLE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="RelegateRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="RelegateRecordMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="RelegateRecordMainRules"
+    :formAllSchemas="RelegateRecordMain.allSchemas"
+    :apiUpdate="RelegateRecordMainApi.updateRelegateRecordMain"
+    :apiCreate="RelegateRecordMainApi.createRelegateRecordMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="RelegateRecordMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/relegate-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { RelegateRecordMain,RelegateRecordMainRules } from './relegate-record-main.data'
+import * as RelegateRecordMainApi from '@/api/wms/relegateRecordMain'
+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: 'RelegateRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(RelegateRecordMain.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: RelegateRecordMainApi.getRelegateRecordMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:relegate-record-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:relegate-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:relegate-record-main: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:'wms:relegate-record-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-record-main:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =RelegateRecordMain.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 RelegateRecordMainApi.createRelegateRecordMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RelegateRecordMainApi.updateRelegateRecordMain(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, 'basicRelegateRecordMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RelegateRecordMainApi.deleteRelegateRecordMain(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 RelegateRecordMainApi.exportRelegateRecordMain(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 RelegateRecordMainApi.importTemplate()
+})
+
+</script>
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
@ -0,0 +1,204 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RelegateRecordMainRules = reactive({
+  departmentCode: [required],
+  interfaceType: [required],
+  number: [required],
+  businessType: [required],
+})
+
+export const RelegateRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    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: 'activeDate',
+    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: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    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: 'dueTime',
+    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: 'departmentCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '用户组',
+    field: 'userGroupCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@ -48,7 +48,7 @@

  <!-- 详情 -->
  <Detail ref="detailRef" 
-    :isBasic="true" 
+    :isBasic="false" 
    :allSchemas="RelegateRequestMain.allSchemas"
    :detailAllSchemas="RelegateRequestDetail.allSchemas" 
    :detailAllSchemasRules="RelegateRequestDetailRules"
@ -58,8 +58,8 @@
    :apiDelete="RelegateRequestDetailApi.deleteRelegateRequestDetail" 
    fromeWhere="RelegateRequestMain"
    @searchTableSuccessDetail="searchTableSuccessDetail" 
-    :detailButtonIsShowAdd="trueFalse"
-    :detailButtonIsShowDelete="trueFalse" />
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowDelete="true" />

  <!-- 导入 -->
  <ImportForm ref="importFormRef" url="/wms/relegate-request-main/import" :importTemplateData="importTemplateData"
@ -239,6 +239,12 @@ const butttondata = (row, $index) => {
    return []
  }
  return [
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑
    defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除
  ]
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@ -29,7 +29,7 @@
      v-model:sort="tableObject.sort"
    >
      <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
          <span>{{ row.number }}</span>
        </el-button>
      </template>
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@ -81,6 +81,16 @@
    :isShowReduceButton="false"
    :isShowFooterButtton="false"
  />
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+

 </template>

@ -219,7 +229,8 @@ const butttondata = (row,$index) => {
      color: '',
      hasPermi: 'wms:purchasereceipt-job-main:close',
      link: true // 文本展现按钮
-    }
+    },
+    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
  ]
 }

@ -233,8 +244,18 @@ const buttonTableClick = async (val, row) => {
    handleClose(row.masterId)
  } else if (val == 'mainJobAcc') { // 承接
    console.log('列表-操作按钮事件-承接')
+  }else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
  }
 }
+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}

 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@ -89,6 +89,16 @@
    :isShowReduceButton="false"
    :isShowFooterButtton="false"
  />
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+

 </template>

@ -162,6 +172,7 @@ const butttondata = (row,$index) => {
  return [
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
+   defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
  ]
 }

@ -171,8 +182,18 @@ const buttonTableClick = async (val, row) => {
    handleCreatePutawayRequest(row.number)
  }else if(val == 'inspectRequest'){//生成到货检验申请
    handleCreateInspectRequest(row.number)
+  }else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
  }
 }
+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}

 /** 生成采购上架申请按钮操作 */
 const handleCreatePutawayRequest = async (number:string) => {
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue
@ -0,0 +1,56 @@
+<template>
+           <div style="height:100%;overflow-y: auto;">
+            <ContentWrap >
+            <Annex
+            :annexData="reportAnnex"
+            :showDownload = "false"
+            :showPreview="true"
+            :hiddenDelete = "true"
+            :upData="{
+                tableId:30,
+                tableName:'SupplierdeliverInspectionDetail'
+            }" 
+            :key="99"
+            :showAddBtn="false"
+            />
+        </ContentWrap> 
+
+        <ContentWrap v-if="subDetailTableData.tableList.length>0">
+            <Table 
+                align="center"
+                :columns="subDetailTableData.tableColumns"
+                :data="subDetailTableData.tableList"
+                :loading="false"
+            />
+        </ContentWrap>
+           </div>
+     
+</template>
+<script lang="ts" setup>
+// 查看质检报告
+import {queryQualityInspection} from '@/api/wms/supplierdeliverInspectionDetail'
+import Annex from '@/components/Annex/src/Annex.vue'
+defineOptions({ name: 'purchasereceiptReport' })
+const route = useRoute() // 路由
+const reportAnnex = reactive({
+    annexList: []
+})
+const subDetailTableData = ref({
+    tableList: [],
+    tableColumns: [],
+})
+onMounted(() => {
+    getAnnexList()
+})
+const getAnnexList = async () => {
+    let res = await queryQualityInspection(route.query.asnNumber as string)
+    reportAnnex.annexList =  res.fileList
+    subDetailTableData.value = {
+        tableList: res.inspectionDetailRespVOList,
+        tableColumns:[{"label":"物料代码","field":"itemCode","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true}},{"label":"供应商批次","field":"batch","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true}},{"label":"发货数量","field":"planQty","sort":"custom","isForm":false,"isSearch":true,"form":{"componentProps":{"disabled":true}},"tableForm":{"disabled":true,"type":"InputNumber","min":0,"precision":6}},{"width":150,"label":"计量单位","field":"uom","dictType":"uom","dictClass":"string","isTable":true,"isForm":false,"sort":"custom","table":{"width":150},"tableForm":{"type":"Select","disabled":true},"form":{"componentProps":{"disabled":true}}},{"label":"创建时间","field":"createTime","sort":"custom","isSearch":true,"search":{"component":"DatePicker","componentProps":{"valueFormat":"YYYY-MM-DD HH:mm:ss","type":"daterange","defaultTime":["2000-12-31T16:00:00.000Z","2001-01-01T15:59:59.000Z"]}},"isTableForm":false,"isForm":false}],
+    }
+    console.log('tableColumns',JSON.stringify(subDetailTableData.value.tableColumns))
+}
+</script>
+<style lang="scss" scoped></style>
+
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@ -54,6 +54,8 @@
    :isBusiness="true"
    @handleAddTable="handleAddTable"
    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
    @searchTableSuccess="searchTableSuccess"
    @submitForm="submitForm"
    @formFormDateChange="formFormDateChange"
@ -126,8 +128,16 @@
  />
  <!-- 标签打印 -->
  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
-
-
+  <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      width="90%"
+      append-to-body
+      destroy-on-close
+    >
+    <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+  
 </template>

 <script setup lang="ts">
@ -354,7 +364,8 @@ const butttondata = (row,$index) => {
    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
-  ]
+    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+      ]
 }

 // 列表-操作按钮事件
@ -384,9 +395,19 @@ const buttonTableClick = async (val, row) => {
  }else if (val == 'point') {
    // 标签打印
    labelPrint(row)
-  } 
+  }else if(val == 'mainPlanCheckQualityReport'){
+    // 查看质检报告
+    checkQualityReport(row)
+  }
 }

+// 查看质检报告
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row)=>{
+  showQualityReport.value = true
+  qualityReport.value = `${import.meta.env.VITE_REPORT_URL}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}

 // 生成标签
 const isCreateLabel = ref(false)
@ -680,6 +701,9 @@ const handleAddTable = () => {
 const handleDeleteTable = (item, index) => {
  tableData.value.splice(index, 1)
 }
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
 const onEnter = async (field,value)=>{
  console.log(field,value)
  getSearchTableData(value,true)