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

README.md

@@ -23,8 +23,6 @@ form: {
       ]
     }
 }
-
-
 **tableForm明细列表查询弹窗配置**
 tableForm:{
   isInpuFocusShow: true, // 开启查询弹窗 【**与form表单中唯一不同属性**】

src/api/infra/config/index.ts

@@ -6,9 +6,6 @@ export interface ConfigVO {
   name: string
   key: string
   value: string
-  itemType: string
-  areaType: string
-  inventoryStatus: string
   type: number
   visible: boolean
   remark: string
@@ -30,11 +27,6 @@ export const getConfigKey = (configKey: string) => {
   return request.get({ url: '/infra/config/get-value-by-key?key=' + configKey })
 }
 
-// 根据参数键名查询参数值
-export const queryByKey = (configKey: string) => {
-  return request.get({ url: '/infra/config/queryByKey?key=' + configKey })
-}
-
 // 新增参数
 export const createConfig = (data: ConfigVO) => {
   return request.post({ url: '/infra/config/create', data })

src/api/mes/orderDay/index.ts

@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface OrderDayVO {
+  status: string
+  remark: string
+  planNoMonth: string
+  planNoDay: string
+  productCode: string
+  workroomCode: string
+  lineCode: string
+  planCount: number
+  processrouteCode: string
+  tempProcessroute: string
+  standardBom: string
+  tempBom: string
+  workMode: string
+  planDate: Date
+  startTime: Date
+  endTime: Date
+  taskMode: string
+}
+
+// 查询生产日计划列表
+export const getOrderDayPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/orderday/senior', data })
+  } else {
+    return await request.get({ url: `/mes/orderday/page`, params })
+  }
+}
+
+// 查询生产日计划详情
+export const getOrderDay = async (id: number) => {
+  return await request.get({ url: `/mes/orderday/get?id=` + id })
+}
+
+// 新增生产日计划
+export const createOrderDay = async (data: OrderDayVO) => {
+  return await request.post({ url: `/mes/orderday/create`, data })
+}
+
+// 修改生产日计划
+export const updateOrderDay = async (data: OrderDayVO) => {
+  return await request.put({ url: `/mes/orderday/update`, data })
+}
+
+// 删除生产日计划
+export const deleteOrderDay = async (id: number) => {
+  return await request.delete({ url: `/mes/orderday/delete?id=` + id })
+}
+
+// 导出生产日计划 Excel
+export const exportOrderDay = async (params) => {
+  return await request.download({ url: `/mes/orderday/export-excel`, params })
+}
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/orderday/get-import-template' })
+}
+// 根据产品编码获取Bom
+export const getBoms = async (code: String)  => {
+  return request.get({ url: '/mes/common/geBomByProductCode?code='+code })
+}
+// 根据产品编码获取工艺路线
+export const getProcessroutes = async (code: String)  => {
+  return request.get({ url: '/mes/common/getProcessRouteByProductCode?code='+code })
+}
+// 根据车间编码获取产线列表
+export const getProductlines = async (code: String)  => {
+  return request.get({ url: '/mes/common/getLinesByWorkRoomCode?code='+code })
+}

src/api/mes/productionPlan/index.ts

@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductionPlanVO {
-  id: number
-  planCode: string
-  planName: string
-  teamType: string
-  endTime: Date
-  shiftMode: string
-  billState: number
-  deleteTime: Date
-  status: string
-  concurrencyStamp: number
-  remark: string
-  deleter: string
-  siteId: number
-  textOne: string
-  textTwo: string
-  textThree: string
-}
-
-// 查询生产排产计划列表
-export const getProductionPlanPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/productionPlan/senior', data })
-  } else {
-    return await request.get({ url: `/mes/productionPlan/page`, params })
-  }
-}
-
-// 查询生产排产计划详情
-export const getProductionPlan = async (id: number) => {
-  return await request.get({ url: `/mes/productionPlan/get?id=` + id })
-}
-
-// 新增生产排产计划
-export const createProductionPlan = async (data: ProductionPlanVO) => {
-  return await request.post({ url: `/mes/productionPlan/create`, data })
-}
-
-// 修改生产排产计划
-export const updateProductionPlan = async (data: ProductionPlanVO) => {
-  return await request.put({ url: `/mes/productionPlan/update`, data })
-}
-
-// 删除生产排产计划
-export const deleteProductionPlan = async (id: number) => {
-  return await request.delete({ url: `/mes/productionPlan/delete?id=` + id })
-}
-
-// 导出生产排产计划 Excel
-export const exportProductionPlan = async (params) => {
-  return await request.download({ url: `/mes/productionPlan/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/mes/productionPlan/get-import-template' })
-}

src/api/mes/teamSetting/index.ts

@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-export interface TeamSettingVO {
-  id: number
-  teamCode: string
-  teamName: string
-  teamType: string
-  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 getTeamSettingPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/teamSetting/senior', data })
-  } else {
-    return await request.get({ url: `/mes/teamSetting/page`, params })
-  }
-}
-
-// 查询班组人员管理详情
-export const getTeamSetting = async (id: number) => {
-  return await request.get({ url: `/mes/teamSetting/get?id=` + id })
-}
-
-// 新增班组人员管理
-export const createTeamSetting = async (data: TeamSettingVO) => {
-  return await request.post({ url: `/mes/teamSetting/create`, data })
-}
-
-// 修改班组人员管理
-export const updateTeamSetting = async (data: TeamSettingVO) => {
-  return await request.put({ url: `/mes/teamSetting/update`, data })
-}
-
-// 删除班组人员管理
-export const deleteTeamSetting = async (id: number) => {
-  return await request.delete({ url: `/mes/teamSetting/delete?id=` + id })
-}
-
-// 导出班组人员管理 Excel
-export const exportTeamSetting = async (params) => {
-  return await request.download({ url: `/mes/teamSetting/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/mes/teamSetting/get-import-template' })
-}

src/api/mes/workstation/index.ts

@@ -48,8 +48,7 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
-// 查询班组列表
+}// 查询班组列表
 export const getTeamPage = async (params) => {
   console.log(goalParams.workstationCode)
   params.workstationCode = goalParams.workstationCode
@@ -61,6 +60,35 @@ export const getTeamPage = async (params) => {
     return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
   }
 }
+// 查询选择班组列表
+export const checkTeamPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加班组关联
+export const createTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除班组关联
+export const deleteTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
 export const getEquipmentPage = async (params) => {
   console.log(goalParams.workstationCode)
   params.workstationCode = goalParams.workstationCode
@@ -72,6 +100,35 @@ export const getEquipmentPage = async (params) => {
     return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
   }
 }
+// 查询选择设备列表
+export const checkEquipmentPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加设备关联
+export const createEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除设备关联
+export const deleteEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
 export const getProcessPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -81,6 +138,32 @@ export const getProcessPage = async (params) => {
     return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
+export const checkProcessPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加工序关联
+export const createProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除工序关联
+export const deleteProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
 export const getProductionPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -90,3 +173,29 @@ export const getProductionPage = async (params) => {
     return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
+export const checkProductionPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加产品关联
+export const createProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除产品关联
+export const deleteProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}

src/api/system/dict/dict.data.ts

@@ -23,13 +23,8 @@ export const getDictDataPage = (params: PageParam) => {
   return request.get({ url: '/system/dict-data/page', params })
 }
 
-// 查询字典数据列表根据类型
-export const queryByDictType = (dictType: number) => {
-  return request.get({ url: '/system/dict-data/queryByDictType?dictType=' + dictType })
-}
-
 // 查询字典数据详情
-export const getDictData = (id: string) => {
+export const getDictData = (id: number) => {
   return request.get({ url: '/system/dict-data/get?id=' + id })
 }
 

src/api/wms/backflushRequestDetailb/index.ts

@@ -23,38 +23,38 @@ export const getBackflushRequestDetailbPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-request-detailb/senior', data })
+    return await request.post({ url: '/wms/backflush-request-detailb/senior', data })
   } else {
-    return await request.get({ url: `/wms/productreceipt-request-detailb/page`, params })
+    return await request.get({ url: `/wms/backflush-request-detailb/page`, params })
   }
 }
 
 // 查询制品收货申请子详情
 export const getBackflushRequestDetailb = async (id: number) => {
-  return await request.get({ url: `/wms/productreceipt-request-detailb/get?id=` + id })
+  return await request.get({ url: `/wms/backflush-request-detailb/get?id=` + id })
 }
 
 // 新增制品收货申请子
 export const createBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
-  return await request.post({ url: `/wms/productreceipt-request-detailb/create`, data })
+  return await request.post({ url: `/wms/backflush-request-detailb/create`, data })
 }
 
 // 修改制品收货申请子
 export const updateBackflushRequestDetailb = async (data: BackflushRequestDetailbVO) => {
-  return await request.put({ url: `/wms/productreceipt-request-detailb/update`, data })
+  return await request.put({ url: `/wms/backflush-request-detailb/update`, data })
 }
 
 // 删除制品收货申请子
 export const deleteBackflushRequestDetailb = async (id: number) => {
-  return await request.delete({ url: `/wms/productreceipt-request-detailb/delete?id=` + id })
+  return await request.delete({ url: `/wms/backflush-request-detailb/delete?id=` + id })
 }
 
 // 导出制品收货申请子 Excel
 export const exportBackflushRequestDetailb = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-request-detailb/export-excel`, params })
+  return await request.download({ url: `/wms/backflush-request-detailb/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/productreceipt-request-detailb/get-import-template' })
+  return request.download({ url: '/wms/backflush-request-detailb/get-import-template' })
 }

src/api/wms/itembasic/index.ts

@@ -34,7 +34,7 @@ export const getItembasicPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/itembasic/senior', data })
+    return request.post({ url: '/wms/itembasic/senior', data })
   } else {
     return await request.get({ url: `/wms/itembasic/page`, params })
   }

src/api/wms/itempackage/index.ts

@@ -24,7 +24,7 @@ export const getItempackagingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/itempackage/senior', data })
+    return request.post({ url: '/wms/itempackage/senior', data })
   } else {
     return await request.get({ url: `/wms/itempackage/page`, params })
   }
@@ -41,17 +41,6 @@ export const getItempackagingPageBySupplierdeliver = async (params) => {
   }
 }
 
-// 查询物料包装信息 列表--制品收货申请
-export const getItempackagingPageByProductreceipt = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return request.post({ url: '/wms/itempackage/seniorByProductreceipt', data })
-  } else {
-    return await request.get({ url: `/wms/itempackage/pageByProductreceipt`, params })
-  }
-}
-
 
 // 查询物料包装信息 详情
 export const getItempackaging = async (id: number) => {

src/api/wms/packageoverRetrospect/index.ts

@@ -1,83 +0,0 @@
-import request from '@/config/axios'
-
-export interface PackageoverRetrospectVO {
-  id: number
-  number: string
-  jobNumber: string
-  warehouseCode: string
-  areaCode: string
-  locationGroupCode: string
-  locationCode: string
-  itemCode: string
-  itemName: string
-  itemDesc1: string
-  itemDesc2: string
-  projectCode: string
-  qty: number
-  uom: string
-  requestTime: Date
-  dueTime: Date
-  fromPackingNumber: string
-  toPackingNumber: string
-  fromBatch: string
-  toBatch: string
-  fromPackUnit: string
-  toPackUnit: string
-  fromPackQty: number
-  toPackQty: number
-  fromInventoryStatus: string
-  toInventoryStatus: string
-  fromContainerNumber: string
-  toContainerNumber: string
-  businessType: string
-  departmentCode: string
-  outTransactionType: string
-  inTransactionType: string
-  executeTime: Date
-  activeDate: Date
-  fromOwnerCode: string
-  toOwnerCode: string
-  remark: string
-  available: string
-}
-
-// 查询翻包记录主列表
-export const getPackageoverRetrospectPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/packageover-retrospect/senior', data })
-  } else {
-    return await request.get({ url: `/wms/packageover-retrospect/page`, params })
-  }
-}
-
-// 查询翻包记录主详情
-export const getPackageoverRetrospect = async (id: number) => {
-  return await request.get({ url: `/wms/packageover-retrospect/get?id=` + id })
-}
-
-// 新增翻包记录主
-export const createPackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
-  return await request.post({ url: `/wms/packageover-retrospect/create`, data })
-}
-
-// 修改翻包记录主
-export const updatePackageoverRetrospect = async (data: PackageoverRetrospectVO) => {
-  return await request.put({ url: `/wms/packageover-retrospect/update`, data })
-}
-
-// 删除翻包记录主
-export const deletePackageoverRetrospect = async (id: number) => {
-  return await request.delete({ url: `/wms/packageover-retrospect/delete?id=` + id })
-}
-
-// 导出翻包记录主 Excel
-export const exportPackageoverRetrospect = async (params) => {
-  return await request.download({ url: `/wms/packageover-retrospect/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/packageover-retrospect/get-import-template' })
-}

src/api/wms/productionMain/index.ts

@@ -24,43 +24,6 @@ export interface ProductionMainVO {
 
 // 查询生产计划主列表
 export const getProductionMainPage = async (params) => {
-  params.planType = 'predict'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/production-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/production-main/page`, params })
-  }
-}
-
-// 查询 —— 装配 主列表
-export const getProductionMainAssemblePage = async (params) => {
-  params.planType = 'assemble'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/production-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/production-main/page`, params })
-  }
-}
-
-// 查询 —— 预生产备件 主列表
-export const getProductionMainPredictSparePartPage = async (params) => {
-  params.planType = 'predictSparePart'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/production-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/production-main/page`, params })
-  }
-}
-
-// 查询 —— 装配备件 主列表
-export const getProductionMainASparePartPage = async (params) => {
-  params.planType = 'assembleSparePart'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -95,42 +58,8 @@ export const deleteProductionMain = async (id: number) => {
   return await request.delete({ url: `/wms/production-main/delete?id=` + id })
 }
 
-// 导出预生产计划主 Excel
+// 导出生产计划主 Excel
 export const exportProductionMain = async (params) => {
-  params.planType = 'predict'
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
-  } else {
-    return await request.download({ url: `/wms/production-main/export-excel`, params })
-  }
-}
-
-// 导出装配计划主 Excel
-export const exportProductionMainAssemble = async (params) => {
-  params.planType = 'assemble'
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
-  } else {
-    return await request.download({ url: `/wms/production-main/export-excel`, params })
-  }
-}
-
-// 导出装配备件计划主 Excel
-export const exportProductionMainPredictSparePart = async (params) => {
-  params.planType = 'predictSparePart'
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })
-  } else {
-    return await request.download({ url: `/wms/production-main/export-excel`, params })
-  }
-}
-
-// 导出预生产备件计划主 Excel
-export const exportProductionMainAssembleSparePart = async (params) => {
-  params.planType = 'assembleSparePart'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/production-main/export-excel-senior`, data })

src/api/wms/productreceiptJobMain/index.ts

@@ -44,7 +44,6 @@ export interface ProductreceiptJobMainVO {
 
 // 查询制品收货任务主列表
 export const getProductreceiptJobMainPage = async (params) => {
-  params.type = 'predict'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -54,31 +53,6 @@ export const getProductreceiptJobMainPage = async (params) => {
   }
 }
 
-// 查询装配收货任务主列表
-export const getProductreceiptJobMainAssemblePage = async (params) => {
-  params.type = 'assemble'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
-  }
-}
-
-// 查询报废收货货任务主列表
-export const getProductreceiptscapJobMainPage = async (params) => {
-  params.type = 'scrap'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-job-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-job-main/page`, params })
-  }
-}
-
-
 // 查询制品收货任务主详情
 export const getProductreceiptJobMain = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-job-main/get?id=` + id })
@@ -101,19 +75,6 @@ export const deleteProductreceiptJobMain = async (id: number) => {
 
 // 导出制品收货任务主 Excel
 export const exportProductreceiptJobMain = async (params) => {
-  params.type = 'predict'
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
-  } else {
-    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
-  }
-}
-
-
-// 导出装配收货任务主 Excel
-export const exportProductreceiptJobMainAssemble = async (params) => {
-  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })

src/api/wms/productreceiptRecordMain/index.ts

@@ -29,31 +29,6 @@ export interface ProductreceiptRecordMainVO {
 
 // 查询制品收货记录主列表
 export const getProductreceiptRecordMainPage = async (params) => {
-  params.type = 'predict'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
-  }
-}
-
-// 查询装配收货记录主列表
-export const getProductreceiptRecordMainAssemblePage = async (params) => {
-  params.type = 'assemble'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-record-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-record-main/page`, params })
-  }
-}
-
-// 查询报废收货记录主列表
-export const getProductreceiptRecordMainScrapPage = async (params) => {
-  params.type = 'scrap'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -85,19 +60,6 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 
 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
-  params.type = 'predict'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
-  } else {
-    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
-  }
-}
-
-// 导出装配收货记录主 Excel
-export const exportProductreceiptRecordAssembleMain = async (params) => {
-  params.type = 'assemble'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}

src/api/wms/productreceiptRequestMain/index.ts

@@ -27,7 +27,6 @@ export interface ProductreceiptRequestMainVO {
 
 // 查询制品收货申请主列表
 export const getProductreceiptRequestMainPage = async (params) => {
-  params.type = 'predict'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
@@ -37,31 +36,6 @@ export const getProductreceiptRequestMainPage = async (params) => {
   }
 }
 
-// 查询制品收货申请主列表
-export const getProductreceiptRequestMainAssemblePage = async (params) => {
-  params.type = 'assemble'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
-  }
-}
-
-// 查询报废收货申请主列表
-export const getProductreceiptRequestMainScrapPage = async (params) => {
-  params.type = 'scrap'
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-request-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productreceipt-request-main/page`, params })
-  }
-}
-
-
 // 查询制品收货申请主详情
 export const getProductreceiptRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-request-main/get?id=` + id })
@@ -84,18 +58,6 @@ export const deleteProductreceiptRequestMain = async (id: number) => {
 
 // 导出制品收货申请主 Excel
 export const exportProductreceiptRequestMain = async (params) => {
-  params.type = 'predict'
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
-  } else {
-    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
-  }
-}
-
-// 导出制品收货申请主 Excel
-export const exportProductreceiptRequestMainAssemble = async (params) => {
-  params.type = 'assemble'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })

src/api/wms/productredressJobDetail/index.ts

@@ -1,71 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressJobDetailVO {
-  id: number
-  productionLineCode: string
-  workStationCode: string
-  processCode: string
-  packingNumber: string
-  containerNumber: string
-  batch: string
-  produceDate: Date
-  expireDate: Date
-  inventoryStatus: string
-  toLocationCode: string
-  woNumber: string
-  woLine: string
-  packQty: number
-  packUnit: string
-  itemCode: string
-  itemName: string
-  itemDesc1: string
-  itemDesc2: string
-  projectCode: string
-  qty: number
-  uom: string
-  masterId: number
-  number: string
-  remark: string
-  toOwnerCode: string
-}
-
-// 查询制品回收任务子列表
-export const getProductredressJobDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-job-detail/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-job-detail/page`, params })
-  }
-}
-
-// 查询制品回收任务子详情
-export const getProductredressJobDetail = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-job-detail/get?id=` + id })
-}
-
-// 新增制品回收任务子
-export const createProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
-  return await request.post({ url: `/wms/productredress-job-detail/create`, data })
-}
-
-// 修改制品回收任务子
-export const updateProductredressJobDetail = async (data: ProductredressJobDetailVO) => {
-  return await request.put({ url: `/wms/productredress-job-detail/update`, data })
-}
-
-// 删除制品回收任务子
-export const deleteProductredressJobDetail = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-job-detail/delete?id=` + id })
-}
-
-// 导出制品回收任务子 Excel
-export const exportProductredressJobDetail = async (params) => {
-  return await request.download({ url: `/wms/productredress-job-detail/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-job-detail/get-import-template' })
-}

src/api/wms/productredressJobMain/index.ts

@@ -1,87 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressJobMainVO {
-  id: number
-  requestNumber: string
-  productionPlanNumber: string
-  workShopCode: string
-  team: string
-  shift: string
-  details: string
-  requestTime: Date
-  requestDueTime: Date
-  status: string
-  expiredTime: Date
-  jobStageStatus: string
-  priority: number
-  priorityIncrement: number
-  departmentCode: string
-  userGroupCode: string
-  acceptUserId: string
-  acceptUserName: string
-  acceptTime: Date
-  completeUserId: string
-  completeUserName: string
-  completeTime: Date
-  toWarehouseCode: string
-  toAreaCodes: string
-  fromAreaTypes: string
-  toAreaTypes: string
-  number: string
-  type: string
-  businessType: string
-  remark: string
-  autoComplete: string
-  allowModifyLocation: string
-  allowModifyQty: string
-  allowBiggerQty: string
-  allowSmallerQty: string
-  allowModifyInventoryStatus: string
-  allowContinuousScanning: string
-  allowPartialComplete: string
-  allowModifyBatch: string
-  allowModifyPackingNumber: string
-  inInventoryStatuses: string
-  outInventoryStatuses: string
-}
-
-// 查询制品回收任务主列表
-export const getProductredressJobMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-job-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-job-main/page`, params })
-  }
-}
-
-// 查询制品回收任务主详情
-export const getProductredressJobMain = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-job-main/get?id=` + id })
-}
-
-// 新增制品回收任务主
-export const createProductredressJobMain = async (data: ProductredressJobMainVO) => {
-  return await request.post({ url: `/wms/productredress-job-main/create`, data })
-}
-
-// 修改制品回收任务主
-export const updateProductredressJobMain = async (data: ProductredressJobMainVO) => {
-  return await request.put({ url: `/wms/productredress-job-main/update`, data })
-}
-
-// 删除制品回收任务主
-export const deleteProductredressJobMain = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id })
-}
-
-// 导出制品回收任务主 Excel
-export const exportProductredressJobMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-job-main/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-job-main/get-import-template' })
-}

src/api/wms/productredressRecordDetail/index.ts

@@ -1,77 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressRecordDetailVO {
-  id: number
-  productionlineCode: string
-  workStationCode: string
-  processCode: string
-  packingNumber: string
-  containerNumber: string
-  batch: string
-  produceDate: Date
-  expireDate: Date
-  inventoryStatus: string
-  toLocationCode: string
-  toLocationGroupCode: string
-  toAreaCode: string
-  toOwnerCode: string
-  woNumber: string
-  woLine: string
-  packQty: number
-  packUnit: string
-  bomVersion: string
-  backFlushDetails: string
-  masterId: number
-  number: string
-  itemCode: string
-  remark: string
-  siteId: string
-  itemName: string
-  itemDesc1: string
-  itemDesc2: string
-  projectCode: string
-  qty: number
-  uom: string
-  interfaceType: string
-}
-
-// 查询制品回收记录子列表
-export const getProductredressRecordDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-record-detail/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-record-detail/page`, params })
-  }
-}
-
-// 查询制品回收记录子详情
-export const getProductredressRecordDetail = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-record-detail/get?id=` + id })
-}
-
-// 新增制品回收记录子
-export const createProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
-  return await request.post({ url: `/wms/productredress-record-detail/create`, data })
-}
-
-// 修改制品回收记录子
-export const updateProductredressRecordDetail = async (data: ProductredressRecordDetailVO) => {
-  return await request.put({ url: `/wms/productredress-record-detail/update`, data })
-}
-
-// 删除制品回收记录子
-export const deleteProductredressRecordDetail = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-record-detail/delete?id=` + id })
-}
-
-// 导出制品回收记录子 Excel
-export const exportProductredressRecordDetail = async (params) => {
-  return await request.download({ url: `/wms/productredress-record-detail/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-record-detail/get-import-template' })
-}

src/api/wms/productredressRecordMain/index.ts

@@ -1,70 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressRecordMainVO {
-  id: number
-  requestNumber: string
-  jobNumber: string
-  productionPlanNumber: string
-  workshopCode: string
-  team: string
-  shift: string
-  details: string
-  outTransactionType: string
-  inTransactionType: string
-  executeTime: Date
-  activeDate: Date
-  available: string
-  requestTime: Date
-  dueTime: Date
-  departmentCode: string
-  interfaceType: string
-  number: string
-  type: string
-  businessType: string
-  remark: string
-  code: string
-  toWarehouseCode: string
-  toAreaTypes: string
-  toAreaCodes: string
-}
-
-// 查询制品回收记录主列表
-export const getProductredressRecordMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-record-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-record-main/page`, params })
-  }
-}
-
-// 查询制品回收记录主详情
-export const getProductredressRecordMain = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-record-main/get?id=` + id })
-}
-
-// 新增制品回收记录主
-export const createProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
-  return await request.post({ url: `/wms/productredress-record-main/create`, data })
-}
-
-// 修改制品回收记录主
-export const updateProductredressRecordMain = async (data: ProductredressRecordMainVO) => {
-  return await request.put({ url: `/wms/productredress-record-main/update`, data })
-}
-
-// 删除制品回收记录主
-export const deleteProductredressRecordMain = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-record-main/delete?id=` + id })
-}
-
-// 导出制品回收记录主 Excel
-export const exportProductredressRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-record-main/get-import-template' })
-}

src/api/wms/productredressRequestDetail/index.ts

@@ -1,73 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressRequestDetailVO {
-  id: number
-  productionLineCode: string
-  workStationCode: string
-  toLocationCode: string
-  processCode: string
-  packingNumber: string
-  containerNumber: string
-  batch: string
-  produceDate: Date
-  expireDate: Date
-  inventoryStatus: string
-  woNumber: string
-  woLine: string
-  packQty: number
-  packUnit: string
-  bomVersion: string
-  backFlushDetails: string
-  masterId: number
-  number: string
-  itemCode: string
-  remark: string
-  itemName: string
-  itemDesc1: string
-  itemDesc2: string
-  projectCode: string
-  qty: number
-  uom: string
-  toOwnerCode: string
-}
-
-// 查询制品回收申请子列表
-export const getProductredressRequestDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-request-detail/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-request-detail/page`, params })
-  }
-}
-
-// 查询制品回收申请子详情
-export const getProductredressRequestDetail = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-request-detail/get?id=` + id })
-}
-
-// 新增制品回收申请子
-export const createProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
-  return await request.post({ url: `/wms/productredress-request-detail/create`, data })
-}
-
-// 修改制品回收申请子
-export const updateProductredressRequestDetail = async (data: ProductredressRequestDetailVO) => {
-  return await request.put({ url: `/wms/productredress-request-detail/update`, data })
-}
-
-// 删除制品回收申请子
-export const deleteProductredressRequestDetail = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-request-detail/delete?id=` + id })
-}
-
-// 导出制品回收申请子 Excel
-export const exportProductredressRequestDetail = async (params) => {
-  return await request.download({ url: `/wms/productredress-request-detail/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-request-detail/get-import-template' })
-}

src/api/wms/productredressRequestMain/index.ts

@@ -1,100 +0,0 @@
-import request from '@/config/axios'
-
-export interface ProductredressRequestMainVO {
-  id: number
-  productionPlanNumber: string
-  workshopCode: string
-  team: string
-  shift: string
-  toWarehouseCode: string
-  toAreaTypes: string
-  toAreaCodes: string
-  number: string
-  type: string
-  businessType: string
-  remark: string
-  extraProperties: string
-  siteId: string
-  requestTime: Date
-  dueTime: Date
-  departmentCode: string
-  status: string
-  autoCommit: string
-  autoAgree: string
-  autoExecute: string
-  directCreateRecord: string
-  inInventoryStatuses: string
-  outInventoryStatuses: string
-}
-
-// 查询制品回收申请主列表
-export const getProductredressRequestMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/productredress-request-main/senior', data })
-  } else {
-    return await request.get({ url: `/wms/productredress-request-main/page`, params })
-  }
-}
-
-// 查询制品回收申请主详情
-export const getProductredressRequestMain = async (id: number) => {
-  return await request.get({ url: `/wms/productredress-request-main/get?id=` + id })
-}
-
-// 新增制品回收申请主
-export const createProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
-  return await request.post({ url: `/wms/productredress-request-main/create`, data })
-}
-
-// 修改制品回收申请主
-export const updateProductredressRequestMain = async (data: ProductredressRequestMainVO) => {
-  return await request.put({ url: `/wms/productredress-request-main/update`, data })
-}
-
-// 删除制品回收申请主
-export const deleteProductredressRequestMain = async (id: number) => {
-  return await request.delete({ url: `/wms/productredress-request-main/delete?id=` + id })
-}
-
-// 导出制品回收申请主 Excel
-export const exportProductredressRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/productredress-request-main/get-import-template' })
-}
-
-
-// 关闭
-export const close = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/close?id=' + id })
-}
-
-// 重新添加
-export const reAdd = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/reAdd?id=' + id })
-}
-
-// 提交审批
-export const submit = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/submit?id=' + id })
-}
-
-// 驳回
-export const refused = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/refused?id=' + id })
-}
-
-// 审批通过
-export const agree = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/agree?id=' + id })
-}
-
-// 处理
-export const handle = (id) => {
-  return request.put({ url: '/wms/productredress-request-main/handle?id=' + id })
-}

src/api/wms/stdcostprice/index.ts

@@ -56,9 +56,3 @@ export const exportStdcostprice = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/stdcostprice/get-import-template' })
 }
-
-
-// 查询标准成本价格单列表
-export const queryStdcostpriceByItemCode = async (data: StdcostpriceVO) => {
-  return await request.post({ url: `/wms/stdcostprice/queryStdcostpriceByItemCode`, data })
-}

src/components/Annex/src/Annex.vue

@@ -2,9 +2,10 @@
 <template>
   <div class="annex">
     <div class="title flex items-center">
-      <div class="title-txt">附件</div>
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
-        @update:modelValue="handleAnnexSuccess" />
+      <!-- <div class="title-txt">附件</div> -->
+      <UploadFile
+        :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
+        @update:model-value="handleAnnexSuccess" />
     </div>
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">
@@ -72,7 +73,7 @@ const downFile = (item)=>{
 <style scoped lang="scss">
 .title {
   border-bottom: 1px solid #dedede;
-  justify-content: space-between;
+  justify-content: flex-end;
 
   .title-txt {
     width: 80px;

src/components/BasicForm/src/BasicForm.vue

@@ -4,13 +4,12 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
-    :vLoading="formLoading"
   >
-  
   <div 
     style="max-height: 60vh;overflow-y: auto;">
     <Form
       ref="formRef"
+      v-loading="formLoading"
       :rules="rules"
       :schema="formSchema"
       :is-col="true"
@@ -107,7 +106,6 @@
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
-  
   </Dialog>
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>
@@ -242,7 +240,7 @@ const props = defineProps({
     required: false,
     default: null
   },
-  // 窗体底部按钮 显示or隐藏：保存，关闭
+  // 窗体底部按钮：保存，关闭
   isShowFooterButtton: {
     type: Boolean,
     required: false,
@@ -253,12 +251,6 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
-  },
-  // 底部按钮集合
-  footButttondata: {
-    type: Array,
-    required: false,
-    default: null
   }
 })
 
@@ -418,18 +410,11 @@ if (props.isShowFooterButtton) {
     defaultButtons.formCloseBtn(null) // 关闭
   ]
 }
-if (props.footButttondata) {
-  Butttondata = props.footButttondata
-}
 
 /** 按钮事件 */
 const buttonBaseClick = (val) => {
-  // 扩展 按钮事件回调
-  if (props.footButttondata) {
-    emit('footButtonClick',val)
-  } 
   // 保存
-  else if (val == 'save') {
+  if (val == 'save') {
     submitForm()
   }
   // 关闭
@@ -518,8 +503,7 @@ const emit = defineEmits([
   'onChange',
   'onBlur',
   'inputNumberChange',
-  'formFormDateChange',
-  'footButtonClick'
+  'formFormDateChange'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {

src/components/ChangeRecord/src/ChangeRecord.vue

@@ -1,22 +1,23 @@
 <!-- 变更记录组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">变更记录</div>
-    </div>
+    </div> -->
     <div class="list">
       <el-steps direction="vertical" class="mt-16px" :space="90">
         <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">
           <template #icon>
             <slot>
-              <Icon color="#9e9e9e"
+              <Icon
+                color="#9e9e9e"
                 :icon="item.type == 1 ? 'ep:document-add' : item.type == 2 ? 'ep:edit' : item.type == 3 ? 'ep:delete' : item.type == 4 ? 'fa:edit' : item.type == 5 ? 'ep:upload' : item.type == 6 ? 'ep:document-delete' : item.type == 7 ? 'ep:chat-line-square' : item.type == 8 ? 'ep:delete' : ''"
                 class="cursor-pointer" size="20" />
             </slot>
           </template>
           <template #title>
             <slot>
-              <span class="color-#9e9e9e font-size-16px time">{{ formatDate(item.createTime) }}</span>
+              <span class="time font-size-16px color-#9e9e9e">{{ formatDate(item.createTime) }}</span>
             </slot>
           </template>
           <template #description>

src/components/Descriptions/src/Descriptions.vue

@@ -155,7 +155,7 @@ const showAll = () =>{
         </ElDescriptions>
       </div>
     </ElCollapseTransition>
-    <div class="flex align-center  justify-center">
+    <div class="align-center flex justify-center">
       <el-button type="primary" class="mt-20px" @click="showAll">{{ !isShow?'展开':'收起' }}</el-button>
     </div>
   </div>

src/components/Detail/src/Detail.vue

@@ -28,7 +28,7 @@
       <Tabs :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[73%]">
+        <ContentWrap class="w-[100%]" v-show="current<tabsList.length-3">
           <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
@@ -98,9 +98,12 @@
             </template>
           </DetailTable>
         </ContentWrap>
-        <ContentWrap class="w-[27%] ml-16px">
+
+        <!-- 附件/备注/变更记录 -->
+        <ContentWrap class="w-[100%]" v-show="current>=tabsList.length-3">
           <!-- 附件组件 -->
           <Annex
+            v-show="current===tabsList.length-3"
             :annexData="annexData"
             @handleAnnexSuccess="handleAnnexSuccess"
             @deleteAnnexSuccess="deleteAnnexSuccess"
@@ -108,14 +111,16 @@
           />
           <!-- 备注组件 -->
           <Remarks
+            v-show="current===tabsList.length-2"
             :remarksData="remarksData"
             class="mt-20px"
             @remarksSubmitScuess="remarksSubmitScuess"
           />
           <!-- 变更记录组件 -->
-          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+          <ChangeRecord v-show="current===tabsList.length-1" :changeRecordData="changeRecordData" class="mt-20px" />
         </ContentWrap>
       </div>
+      
     </el-drawer>
     <!-- 表单弹窗：添加/修改 -->
     <BasicForm
@@ -322,8 +327,16 @@ if (props.isBasic == true) {
     ]
   }
 }
-if (tabsList.value) {
-}
+tabsList.value = [...tabsList?.value,{
+    label:'附件',
+    prop:'Annex'
+  },{
+    label:'备注',
+    prop:'Remarks'
+  },{
+    label:'变更记录',
+    prop:'ChangeRecord'
+  }]
 
 // 附件默认数据
 const annexData = reactive({

src/components/Dialog/src/Dialog.vue

@@ -11,8 +11,7 @@ const props = defineProps({
   fullscreen: propTypes.bool.def(true),
   width: propTypes.oneOfType([String, Number]).def('40%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
-  maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
-  vLoading:propTypes.bool.def(false)
+  maxHeight: propTypes.oneOfType([String, Number]).def('400px')
 })
 
 const getBindValue = computed(() => {
@@ -51,34 +50,11 @@ watch(
   }
 )
 
-let demo = null
-watch(
-  () => props.vLoading,
-  async (val: boolean) => {
-    await nextTick()
-    if (val) {
-      initDialog()
-    } else {
-      if (demo !== null) demo.close()
-    }
-  },
-  {
-    immediate: true
-  }
-)
-
 const dialogStyle = computed(() => {
   return {
     height: unref(dialogHeight)
   }
 })
-
-
-const initDialog = () => {
-  // 用服务生成一个el-loading实例，包括了自定义svg的指令如何在服务中使用
-  demo = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
-}
-
 </script>
 
 <template>
@@ -92,7 +68,6 @@ const initDialog = () => {
     draggable
     class="com-dialog"
     :show-close="false"
-    custom-class="loading"
   >
     <template #header="{ close }">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">

src/components/ImportForm/src/ImportForm.vue

@@ -14,7 +14,6 @@
         updatePart +
         '&outFile=' +
         outFile + 
-        '&extend=' + extend +
         '&fromInventoryStatus=' + fromInventoryStatus +
         '&toInventoryStatus=' + toInventoryStatus 
       "
@@ -172,19 +171,13 @@ const props = defineProps({
     required: false,
     default: false
   },
-  // 扩展额外属性
-  extend: {
-    type: String,
-    required: false,
-    default: ''
-  },
-  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
+  // 库存修改 扩展额外属性
   fromInventoryStatus: {
     type: String,
     required: false,
     default: ''
   },
-  // 库存修改 扩展额外属性 TODO: 后续优化 业务限定属性应转为统一的额外扩展属性 此处不应该出现业务相关属性 cxm
+  // 库存修改 扩展额外属性
   toInventoryStatus: {
     type: String,
     required: false,

src/components/Remarks/src/Remarks.vue

@@ -1,13 +1,13 @@
 <!-- 备注组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">备注</div>
-    </div>
+    </div> -->
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
         <div class="user-icon mt-4px">
-          <img :src="item.avatar" v-if="item.avatar" alt="" class="w-[100%] h-[100%]"/>
+          <img :src="item.avatar" v-if="item.avatar" alt="" class="h-[100%] w-[100%]" />
           <Icon icon="fa-solid:user" color="#fff" v-else size="16" />
         </div>
         <div class="item-center">
@@ -15,11 +15,11 @@
             <div class="item-title-txt">{{ item.nickname }}</div>
             <div class="time">{{ formatDate(item.createTime) }}</div>
           </div>
-          <div class="mt-8px color-#303133 font-size-14px">{{ item.remark }}</div>
+          <div class="mt-8px font-size-14px color-#303133">{{ item.remark }}</div>
         </div>
       </div>
     </div>
-    <div class="add-remarks flex items-center mt-20px">
+    <div class="add-remarks mt-20px flex items-center">
       <el-input v-model="data.remark" placeholder="请输入备注" />
       <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks">
         确定

src/components/SearchHigh/src/SearchHigh.vue

@@ -126,12 +126,6 @@ const moreListOptions = ref({
     }, {
       value: 'isNotNull',
       label: '不是空'
-    }, {
-      value: 'isStr',
-      label: '是空字符串'
-    }, {
-      value: 'isNotStr',
-      label: '不是空字符串'
     }
   ]
 })
@@ -211,7 +205,7 @@ const resetSelect = (val) => {
 }
 // 范围改变
 const actionSelect = (val)=>{
-  if(val.action=='isNull'|| val.action == 'isNotNull'|| val.action == 'isStr'|| val.action == 'isNotStr'){
+  if(val.action=='isNull'|| val.action == 'isNotNull'){
     val.disabled = true
   }else{
     val.disabled = false

src/components/SearchTable/src/SearchTable.vue

@@ -48,11 +48,18 @@ routeName.value = route.name
 const searchDialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-
+const filterButtonOptions=ref({
+    label: '筛选',
+    name: 'filtrate',
+    hide: false,
+    type: 'info',
+    icon: 'ep:operation',
+    color: '',
+    float:'right',
+    hasPermi: ''
+  })
 // 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultFilterBtn(null), // 筛选
-]
+const HeadButttondata = ref()
 
 /** 打开弹窗 */
 const getListRef = ref()
@@ -67,8 +74,12 @@ const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
 const multipleBol = ref(false)
+//isSearchFilterButtonHide 增加筛选按钮显示隐藏 控制
 const searchConditionRef = ref()
-const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => {
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isSearchFilterButtonHide:any ) => {
+  filterButtonOptions.value.hide=isSearchFilterButtonHide?isSearchFilterButtonHide:false
+  HeadButttondata.value=[ defaultButtons.defaultFilterBtn(filterButtonOptions.value)], // 筛选]
+  //console.log(filterButtonOptions.value)
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
@@ -94,41 +105,32 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   setSearchParamsRef.value = tableObject.params
   getListRef.value = getList
   getList()
+  
 }
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  console.log(99, rowRef.value)
-  console.log(100, searchData)
-  console.log(101, searchConditionRef.value)
+  // console.log(99, rowRef.value)
+  // console.log(100, searchData)
+  // console.log(101, searchConditionRef.value)
   // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
-  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
-  if (searchData.filters) {
-    if (searchConditionRef.value.filters) {
-      Object.keys(searchConditionRef.value.filters).forEach(key => {
-        searchData.filters.push(searchConditionRef.value.filters[key])
-      });
-    } else {
+  if (searchConditionRef.value) {
     Object.keys(searchConditionRef.value).forEach(key => {
+      if (searchData.filters) {
           searchData.filters.push({
             action: "==",
             column: key,
             value: searchConditionRef.value[key]
           })
-      });
-    }
-  } else {
-    if (searchConditionRef.value.filters) {
-      searchData.filters = searchConditionRef.value.filters
+        // }
       } else {
-      Object.keys(searchConditionRef.value).forEach(key => {
         searchData.filters = [{
           action: "==",
           column: key,
           value: searchConditionRef.value[key]
         }]
-      });
       }
+    });
   }
   tableObjectRef.value.params = {
     isSearch: true,

src/components/workstationBind/index.ts

@@ -1,3 +0,0 @@
-import Detail from './src/Detail.vue'
-
-export { Detail }

src/layout/components/useRenderLayout.tsx

@@ -8,6 +8,7 @@ import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
+import RouterSearch from '@/components/RouterSearch/index.vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -35,6 +36,9 @@ const mobile = computed(() => appStore.getMobile)
 // 固定菜单
 const fixedMenu = computed(() => appStore.getFixedMenu)
 
+// 搜索图片
+const search = computed(() => appStore.search)
+
 export const useRenderLayout = () => {
   const renderClassic = () => {
     return (
@@ -58,7 +62,18 @@ export const useRenderLayout = () => {
               style="transition: all var(--transition-time-02);"
             ></Logo>
           ) : undefined}
-          <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
+          {/* {search.value && !appStore.getCollapse? (<div class={[
+          prefixCls,
+          'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between'
+        ]}> <RouterSearch class={[
+          'bg-[var(--left-menu-bg-color)] relative',
+          {
+            '!pl-0': mobile.value && collapse.value,
+            'w-[var(--left-menu-min-width)]': appStore.getCollapse,
+            'w-[var(--left-menu-max-width)]': !appStore.getCollapse
+          }
+        ]} isModal={false} /> </div>) : undefined} */}
+          <Menu class={[{ '!h-[calc(100% - 50px - var(--logo-height)))]': logo.value }]}></Menu>
         </div>
         <div
           class={[

src/utils/dict.ts

@@ -276,6 +276,11 @@ export enum DICT_TYPE {
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
   TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
   PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
+// ========== 业务 - mes ==========
+  MESDO_STATUS= 'mes_do_status', // 工单执行状态
+  MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
+  MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
+  MES_PLANDO_STATUS='mes_plando_status', //计划执行状态
   PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
   DELIVER_TYPE="deliver_type",//发货类型
   BILL_TYPE="bill_type", // 发票类型

src/utils/disposition/defaultButtons.ts

@@ -250,18 +250,7 @@ export function mainListDeleteBtn(option:any) {
     hasPermi: ''
   })
 }
-// 主列表-绑定
-export function mainListBindBtn(option:any) {
-  return __defaultBtnOption(option,{
-    label: '绑定',
-    name: 'bind',
-    hide: false,
-    type: 'primary',
-    color: '',
-    link: true, // 文本展现按钮
-    hasPermi: ''
-  })
-}
+
 // 主列表-申请流程-关闭按钮
 export function mainListCloseBtn(option:any) {
   return __defaultBtnOption(option,{
@@ -746,7 +735,18 @@ export function mainThawRequesttBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 主列表-绑定
+export function mainListBindBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '绑定',
+    name: 'bind',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {

src/utils/validator.ts

@@ -729,7 +729,7 @@ function trim(str) {
 //校验只可输入大小写字母及数字
 export function validateYS(rule, value, callback) {
     if (value) {
-        const regs = /^[a-zA-Z0-9-_]+$/
+        const regs = /^[a-zA-Z0-9-_.]+$/
         if(regs.test(value)){
             callback()
         } else {

src/views/infra/config/ConfigForm.vue

@@ -19,21 +19,6 @@
       <el-form-item label="参数键值" prop="value">
         <el-input v-model="formData.value" placeholder="请输入参数键值" />
       </el-form-item>
-      <el-form-item label="物料类型">
-        <el-select v-model="formData.itemTypeList" multiple placeholder="配置物料类型">
-          <el-option v-for="item in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="库区类型">
-        <el-select v-model="formData.areaTypeList" multiple placeholder="库区类型">
-          <el-option v-for="item in getStrDictOptions(DICT_TYPE.AREA_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="库存状态">
-        <el-select v-model="formData.inventoryStatusList" multiple placeholder="库存状态">
-          <el-option v-for="item in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="是否可见" prop="visible">
         <el-radio-group v-model="formData.visible">
           <el-radio
@@ -56,7 +41,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getBoolDictOptions,getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import * as ConfigApi from '@/api/infra/config'
 
 defineOptions({ name: 'InfraConfigForm' })
@@ -74,9 +59,6 @@ const formData = ref({
   name: '',
   key: '',
   value: '',
-  itemTypeList:'',
-  areaTypeList:'',
-  inventoryStatusList:'',
   visible: true,
   remark: ''
 })
@@ -88,9 +70,6 @@ const formRules = reactive({
   visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-// const itemTypeList = ref([]) // 物料类型列表
-
-
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -144,9 +123,6 @@ const resetForm = () => {
     name: '',
     key: '',
     value: '',
-    itemTypeList:'',
-    areaTypeList:'',
-    inventoryStatusList:'',
     visible: true,
     remark: ''
   }

src/views/infra/config/index.vue

@@ -40,37 +40,22 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="参数主键" align="left" prop="id"  :width="100"/>
-      <el-table-column label="参数分类" align="left" prop="category" :width="150"/>
-      <el-table-column label="参数名称" align="left" prop="name" :show-overflow-tooltip="true" :width="200"/>
-      <el-table-column label="参数键名" align="left" prop="key" :show-overflow-tooltip="true" :width="250"/>
-      <el-table-column label="参数键值" align="left" prop="value" :width="200"/>
-      <el-table-column label="物料类型" align="left" prop="itemType" :width="250">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.itemType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="库区类型" align="left" prop="areaType" :width="250">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.AREA_TYPE" :value="scope.row.areaType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="库存状态" align="left" prop="inventoryStatus" :width="250">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INVENTORY_STATUS" :value="scope.row.inventoryStatus" />
-        </template>
-      </el-table-column>  
+      <el-table-column label="参数主键" align="center" prop="id" />
+      <el-table-column label="参数分类" align="center" prop="category" />
+      <el-table-column label="参数名称" align="center" prop="name" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键名" align="center" prop="key" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键值" align="center" prop="value" />
       <el-table-column label="是否可见" align="center" prop="visible">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.visible" />
         </template>
       </el-table-column>
-      <el-table-column label="系统内置" align="center" prop="type" :width="150">
+      <el-table-column label="系统内置" align="center" prop="type">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" :width="150"/>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" />
       <el-table-column label="操作" align="center" fixed="right" width="180">
         <template #default="scope">

src/views/login/components/LoginForm.vue

@@ -182,7 +182,6 @@ const getCookie = () => {
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
 const handleLogin = async (params) => {
-  console.log('登录-185')
   loginLoading.value = true
   try {
     await getTenantId()
@@ -192,7 +191,6 @@ const handleLogin = async (params) => {
     }
     const res = await LoginApi.login(loginData.loginForm)
     if (!res) {
-      console.log('登录-195')
       getCode()
       return
     }
@@ -221,7 +219,6 @@ const handleLogin = async (params) => {
     const { wsCache } = useCache()
     wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
   } finally {
-    console.log('登录-224')
     getCode()
     loginLoading.value = false
     loading.value.close()

src/views/mes/orderDay/components/BasicFormV2.vue

@@ -0,0 +1,558 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+  >
+  <div style="max-height: 60vh;overflow-y: auto;">
+    <Form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="rules"
+      :schema="formSchema"
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
+      @onBlur="onBlur" />
+  </div>
+    <template #footer>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+    </template>
+  </Dialog>
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+</template>
+<script setup lang="ts">
+import { SearchTable } from '@/components/SearchTable'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+
+const props = defineProps({
+  // 查询弹窗是否显示筛选按钮
+  isSearchFilterButtonHide: {
+    type: Boolean,
+    default: false
+  },
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 是否显示TableForm 新增/删除按钮
+  isShowButton: {
+    type: Boolean,
+    default: true
+  },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 查询参数
+  // searchTableParams: {
+  //   type: Array,
+  //   required: false,
+  //   default: null
+  // },
+  // API——Vo
+  apiVo: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  API——创建
+  apiCreate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  //  API——编辑
+  apiUpdate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  // 是否是业务表单（区分是不显示tableForm）
+  isBusiness: {
+    type: Boolean,
+    required: true,
+    default: true
+  },
+  // 表单form
+  form: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // // 主表参数
+  // masterParmas: {
+  //   type: Object,
+  //   required: false,
+  //   default: null
+  // },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 是否从详情进入
+  isDetail: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 窗体底部按钮：保存，关闭
+  isShowFooterButtton: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogWidth = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+const formRef = ref() // 表单 Ref
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+const searchFilterButtonHide=ref(props.isSearchFilterButtonHide)
+// 列表-按钮
+// const buttondata = [
+//   defaultButtons.mainListEditBtn(null), // 编辑
+//   defaultButtons.mainListDeleteBtn(null)
+// ]
+// // 列表-操作按钮事件
+// const buttonTableClick = async (val, row) => {
+//   if (val == 'edit') {
+    
+//   } else if (val == 'delete') {
+   
+//   } else {
+//   }
+// }
+
+/** 弹层操作 */
+// formField form表单中的字段
+// searchField 查询列表中的字段
+// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的
+// searchCondition 查询条件
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  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,
+    false,
+    searchFilterButtonHide.value
+  )
+}
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+
+/** 打开弹窗 */
+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
+  resetForm()
+  // 修改时，设置数据
+  // 如果是从主表的详情页面进图添加子表，需要添加masterId，number参数
+  if (masterParmas) {
+    if (!row) {
+      row = {
+        masterId: masterParmas.masterId,
+        number: masterParmas.number
+      }
+    }
+  }
+  if (row?.id || row?.masterId) {
+    formLoading.value = true
+    try {
+      nextTick(() => {
+        formRef.value.setValues(row)
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
+
+/** 弹窗按钮 */
+let Butttondata:any = []
+if (props.isShowFooterButtton) {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 保存
+  if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+/** 提交表单 */
+// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const tableFormRef = ref()
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  // 校验表单
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+  // 针对主子表 明细校验
+  if (props.isBusiness) {
+    formLoading.value = true
+    if (formType.value == 'create') {
+      const validateForm = await tableFormRef.value.validateForm()
+      formRef.value.setValues({status:'1'})
+      if (!validateForm && props.tableFormDataLength) {
+        if (props.tableData.length == 0) {
+          message.warning('请填写明细信息！')
+          formLoading.value = false
+          return
+        }
+        formLoading.value = false
+        return
+      }
+      // 主子表——提交请求
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    } else {
+      // 编辑
+      try {
+        const data = unref(formRef)?.formModel
+        emit('submitForm', formType.value, data)
+      } finally {
+      }
+    }
+  } else {
+    // 基础数据单表——提交请求
+    formLoading.value = true
+    try {
+      const data = unref(formRef)?.formModel
+      emit('success', formType.value, data)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  unref(formRef)?.resetFields()
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'success',
+  'tableSelectionChange',
+  'tableFormSelectOnBlur',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'formSelectvVisibleChange',
+  'tableSortChange',
+  'selectCallback',
+  'handleTableSelect',
+  'handleDeleteTable',
+  'handleAddTable',
+  'inpuFocus',
+  'searchTableSuccess',
+  'opensearchTable',
+  'submitForm',
+  'selectChange',
+  'selectChangeDetail',
+  'tableFormChange',
+  'buttonOperationClick',
+  'inputStringBlur',
+  'onChange',
+  'onBlur',
+  'inputNumberChange',
+  'formFormDateChange'
+])
+//普通下拉改变事件
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
+}
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
+}
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+// tableform select bulr
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+
+// 数字输入-改变事件
+const inputNumberChange = (field, index, row, val) => {
+  emit('inputNumberChange', field, index, row, val)
+}
+//下拉框回显方法
+// const showSelect = (val, statusID) => {
+//   return getDictForStatusID(val, statusID)
+// }
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index,formRef.value)
+}
+// 添加数据
+const handleAddTable = () => {
+  emit('handleAddTable')
+}
+// 输入框聚焦
+const inpuFocus = (headerItem, row, index) => {
+  opensearchTable(
+    headerItem.field,
+    headerItem.tableForm.searchField,
+    headerItem.tableForm.searchTitle,
+    headerItem.tableForm.searchAllSchemas,
+    headerItem.tableForm.searchPage,
+    headerItem.tableForm.searchCondition,
+    headerItem.tableForm.multiple,
+    'tableForm',
+    row
+  )
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  emit('onChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+// 修改盘点范围类型
+const selectChangeDetail = (field, val,formSchema) => {
+  formSchema.value = ''
+  emit('selectChangeDetail', field, val)
+}
+
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+
+const buttonOperationClick = (row, label, index)=> {
+  emit("buttonOperationClick", row, label, index);
+}
+
+const inputStringBlur = (headerItem, row, index)=> {
+  emit("inputStringBlur", headerItem, row, index);
+}
+
+</script>
+<style lang="scss" scoped>
+.table {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 32px);
+  display: flex;
+}
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+}
+::v-deep(.el-table td.el-table__cell div) {
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}button
+.button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/components/workstationBind/src/Detail.vue → src/views/mes/orderDay/components/Detail.vue

@@ -24,80 +24,7 @@
           width="200px"
         />
       </ContentWrap>
-
-      <Tabs :tabsList="tabsList" :current="current" @change="change" />
-      <div class="flex">
-        <!-- 详情 -->
-        <ContentWrap class="w-[73%]">
-          <!-- 列表头部 -->
-          <TableHead
-            v-if="!isBasic"
-            :HeadButttondata="HeadButttondata"
-            :masterId="masterParmas.masterId"
-            @button-base-click="buttonBaseClick"
-            :routeName="routeName"
-            @searchFormClick="searchFormClick"
-            :allSchemas="detailAllSchemas"
-          />
-          <!-- 默认单表展现 -->
-          <Descriptions
-            v-if="isBasic && !tabsExtend"
-            :data="detailData"
-            :schema="allSchemas.detailSchema"
-            :columns="2"
-          />
-          <!-- 单表切换tabs 展现table -->
-          <Table
-            v-if="isBasic && tabsExtend"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-          >
-            <!-- <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template> -->
-          </Table>
-          <Table
-            v-if="!isBasic && fromeWhere != 'countPlan'"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-          >
-          <template #photos="{ row }">
-             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
-            </template>
-            <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template>
-          </Table>
-          <DetailTable
-            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :allList="allList"
-            :countScopeType="countScopeType"
-            :key="updateKey"
-          >
-            <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template>
-          </DetailTable>
-        </ContentWrap>
+      <div class="flex mt-20px">
         <ContentWrap class="w-[27%] ml-16px">
           <!-- 附件组件 -->
           <Annex
@@ -117,27 +44,7 @@
         </ContentWrap>
       </div>
     </el-drawer>
-    <!-- 表单弹窗：添加/修改 -->
-    <BasicForm
-      ref="formRef"
-      @success="submitForm"
-      :rules="detailAllSchemasRules"
-      :formAllSchemas="detailAllSchemas"
-      :isBusiness="false"
-      :apiUpdate="apiUpdate"
-      :apiCreate="apiCreate"
-      :fromeWhere="fromeWhere"
-      :isDetail="true"
-      @searchTableSuccess="searchTableSuccess"
-      :detailData="detailData"
-      @submitForm="submitForm"
-      @selectChangeDetail="selectChangeDetail"
-      :formTypeDetail="formTypeDetail"
-      :countPlanAllList="countPlanAllList"
-      @onChange="detailBasicFormOnChange"
-      @onBlur="onBlur"
-      @formFormDateChange="formFormDateChange"
-    />
+   
   </div>
 </template>
 
@@ -145,13 +52,10 @@
 import Annex from '@/components/Annex/src/Annex.vue'
 import Remarks from '@/components/Remarks/src/Remarks.vue'
 import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
-import Tabs from '@/components/Tabs/src/Tabs.vue'
+
 import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 
 defineOptions({ name: 'Detail' })
 

src/views/mes/orderDay/components/sechuled.vue

@@ -0,0 +1,597 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+      <div class="flex mt-20px">
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+   
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+      // 针对特殊处理 当业务是任务的 只显示筛选 正常情况下应在业务页面设置 后期再作优化
+      if (routeName.value.indexOf('Job') > -1) {
+        HeadButttondata.value = [
+          defaultButtons.defaultFilterBtn(null) // 筛选
+        ]
+      }
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+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 updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+ const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>

src/views/mes/orderDay/index.vue

@@ -0,0 +1,324 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="OrderDay.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="OrderDay.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 #planNoDay="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '计划编码', row.planNoDay)">
+          <span>{{ row.planNoDay }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicFormV2
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="OrderDayRules"
+    :formAllSchemas="OrderDay.allSchemas"
+    :apiUpdate="OrderDayApi.updateOrderDay"
+    :apiCreate="OrderDayApi.createOrderDay"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+    :isSearchFilterButtonHide="true"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="OrderDay.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/mes/orderday/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { OrderDay,OrderDayRules } from './orderDay.data'
+import * as OrderDayApi from '@/api/mes/orderDay'
+import BasicFormV2 from './components/BasicFormV2.vue'
+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: 'MesOrderDay' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(OrderDay.allSchemas.tableColumns)
+const  lineOptions=ref([])
+const  processRouteOptions=ref([])
+const bomOptions=ref([])
+//**获取 产品工艺路由列表 */
+const getProcessroutes = async (code: String) => {
+  processRouteOptions.value = await OrderDayApi.getProcessroutes(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'processrouteCode') {
+        console.log('processrouteCode',item.field)
+        item.componentProps.options = processRouteOptions.value
+      }
+    })
+}
+//**获取 车间产线列表 */
+const getProductlines = async (code: String) => {
+  lineOptions.value = await OrderDayApi.getProductlines(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'lineCode') {
+        item.componentProps.options = lineOptions.value
+      }
+    })
+}
+const getBoms = async (code: String) => {
+  bomOptions.value = await OrderDayApi.getBoms(code)
+  OrderDay.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'standardBom') {
+        item.componentProps.options = bomOptions.value
+      }
+    })
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+    if(formField=='productCode'){
+      //formRef.setValues({standardBom:'bomddd'})
+      getProcessroutes(val[0][searchField])
+      getBoms(val[0][searchField])
+    }
+    if(formField=='workroomCode'){
+      getProductlines(val[0][searchField])
+    }
+    
+})
+
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: OrderDayApi.getOrderDayPage // 分页接口
+
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:orderDay:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:orderDay:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:orderDay:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+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) => {
+  //console.log('row',row)
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+// 列表-操作按钮
+// 列表-操作按钮
+const butttondata = (row) => {
+     //console.log('row2',row)
+    return [
+    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row,['1']),hasPermi:'mes:orderDay:delete'}), // 删除
+    defaultButtons.mainListHandleBtn({label: '排产',
+      name: 'schedule',
+      hide: isShowMainButton(row,['1']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 
+    defaultButtons.mainListHandleBtn({label: '发布',
+      name: 'publish',
+      hide: isShowMainButton(row,['2']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 路由设置
+      defaultButtons.mainListHandleBtn({label: '终止',
+      name: 'publish',
+      hide: isShowMainButton(row,['1','2','3']),
+      type: 'warning',
+      icon: '',
+      color: '',
+      hasPermi: ''}), // 路由设置
+    ]
+}
+
+
+// 列表-操作按钮事件
+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 =OrderDay.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 OrderDayApi.createOrderDay(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await OrderDayApi.updateOrderDay(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, 'basicOrderDay')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await OrderDayApi.deleteOrderDay(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 OrderDayApi.exportOrderDay(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 OrderDayApi.importTemplate()
+})
+
+</script>

src/views/mes/orderDay/orderDay.data.ts

@@ -0,0 +1,327 @@
+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'
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import { on } from '@/utils/domUtils'
+
+// 表单校验
+export const OrderDayRules = reactive({
+  planNoDay: [
+    { required: true, message: '请输入一个日计划编号', trigger: 'blur' }
+  ],
+  planNoMonth: [
+    { required: true, message: '请输入一个月计划编号', trigger: 'blur' }
+  ],
+  productCode: [
+    { required: true, message: '请选择一个产品', trigger: 'blur' }
+  ],
+  workroomCode: [
+    { required: true, message: '请选择一个车间', trigger: 'blur' }
+  ],
+  lineCode: [
+    { required: true, message: '请选择一个产线', trigger: 'blur' }
+  ],
+  workMode: [
+    { required: true, message: '请选择工单生成方式', trigger: 'blur' }
+  ],
+  startTime: [
+    { required: true, message: '请输入计划生产开始时间', trigger: 'blur' }
+  ],
+  endTime: [
+    { required: true, message: '请输入计划生产完成时间', trigger: 'blur' }
+  ],
+  planDate: [
+    { required: true, message: '请输入计划日期', trigger: 'blur' }
+  ],
+  taskMode: [
+    { required: true, message: '请选择一个生产方式', trigger: 'blur' }
+  ],
+})
+
+export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '主键',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    width: '60px',
+  },
+  {
+    label: '日计划单号',
+    field: 'planNoDay',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+  },
+  {
+    label: '月计划单号',
+    field: 'planNoMonth',
+    sort: 'custom',
+    isSearch: true,
+    required: false,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    isDetail:true,
+    isSearch: false,
+    width: '80px',
+    dictType: DICT_TYPE.MES_PLANDO_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
+  },
+  {
+    label: '产品编号',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '产品编码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '产品信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        isHideFilterButton:true,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'type',
+          action: 'in', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          value: 'FG,SEMI',//,SEMI]
+          isMainValue: false
+        },
+       
+        ]
+      }
+    }
+  },
+  {
+    label: '车间编码',
+    field: 'workroomCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '车间', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    
+  },
+  {
+    label: '产线编码',
+    field: 'lineCode',
+    sort: 'custom',
+    isSearch: true,
+    required: true,
+    form:{
+      component:'Select',
+      componentProps:{
+        options:[{lablel:'1',value:'1'}]
+      }
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planCount',
+    sort: 'custom',
+    required: true,
+    form: {
+      component: 'InputNumber',
+      value: 1
+    },
+  },
+  {
+    label: '工艺路线编码',
+    field: 'processrouteCode',
+    sort: 'custom',
+    form: {
+      component:'Select',
+      componentProps: {
+        options: []
+      }
+    }
+  },
+  {
+    label: '临时工艺',
+    field: 'tempProcessroute',
+    sort: 'custom',
+    width: '80px',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: 'BOM编码',
+    field: 'standardBom',
+    sort: 'custom',
+    form: {
+      component:'Select',
+      componentProps: {
+        options: [{lablel:'bom',value:'bom'}]
+      }
+    }
+  },
+  {
+    label: '替代BOM',
+    field: 'tempBom',
+    sort: 'custom',
+    width: '80px',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+      }
+    }
+  },
+  {
+    label: '工单模式',
+    field: 'workMode',
+    width: '80px',
+    sort: 'custom',
+    dictType: DICT_TYPE.MES_WORKBILL_MODEL,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      value: 'BATCH',
+    },
+  },
+  {
+    label: '计划日期',
+    field: 'planDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'YYYY-MM-DD',
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'startTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    required: true,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'time',
+        dateFormat: 'HH:mm',
+        //valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isReadonly:true,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'time',
+        dateFormat: 'HH:mm',
+      }
+    },
+  },
+  {
+    label: '生产模式',
+    field: 'taskMode',
+    width : '80px',
+    sort: 'custom',
+    dictType: DICT_TYPE.MES_TASK_MODE,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      value:'ASSIGN'
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetime',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable:false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))

src/views/mes/processroute/components/configDialog.vue

@@ -43,7 +43,27 @@
             <el-table-column prop="code" label="工序编码" width="180" v-if="false" />
           </el-table>
         </el-col>
-        <el-col :span="18"><div ref="graphContainer"></div></el-col>
+        <el-col :span="12"><div ref="graphContainer"></div></el-col>
+        <el-col :span="6">
+          <ContentWrap class="w-[100%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+        </el-col>
+          
       </el-row>
       <el-row style="height: 150px" :gutter="5">
         <el-col :span="6">
@@ -65,7 +85,10 @@
                 <span>设备信息</span>
               </div>
             </template>
-            <p v-for="item in deviceList" :key="item" class="text item">{{ item.name }}</p>
+            <el-table :data="deviceList" ref="tabledeviceList">
+              <el-table-column prop="name" label="设备名称" />
+              <el-table-column prop="code" label="设备编号" />
+            </el-table>
           </el-card></el-col
         >
         <el-col :span="6"
@@ -75,7 +98,11 @@
                 <span>人员信息</span>
               </div>
             </template>
-            <p v-for="item in workerList" :key="item" class="text item">{{ item.name }}</p>
+            <el-table :data="workerList" ref="tableWorker">
+              <el-table-column prop="name" label="人员姓名" />
+              <el-table-column prop="code" label="班组名称" />
+            </el-table>
+            
           </el-card></el-col
         >
         <el-col :span="6"
@@ -85,8 +112,11 @@
                 <span>工位信息</span>
               </div>
             </template>
-            <p>工位编码：{{ workStationData.name }}</p>
-            <p>工位名称：{{ workStationData.code }}</p>
+            <el-table :data="workStationData" ref="tableWorkStation">
+              <el-table-column prop="name" label="工位编码" />
+              <el-table-column prop="code" label="工位名称" />
+            </el-table>
+            
           </el-card></el-col
         >
       </el-row>
@@ -94,6 +124,11 @@
   </div>
 </template>
 <script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
 import { start_node, end_node, createGraph, registerNodes, getNewNode } from './graphbase.data'
 import * as ProcessrouteApi from '@/api/mes/processroute'
 import { Search } from '@/components/Search'
@@ -123,12 +158,32 @@ const deviceList = ref([
   { name: '设备', code: '0000' },
   { name: '设备', code: '0000' }
 ]) //设备数据
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
 const workerList = ref([{ name: '--' }, { name: '--' }]) //人员数据
-const workStationData = ref({ name: '工位', code: '' }) //工位数据
+const workStationData = ref([{ name: '工位', code: '' }]) //工位数据
 //初始化图形组件
 const graph = ref<Graph>()
 const openDetail = async (rowData: any) => {
   rowData.value = rowData
+  remarksData.data = {
+    tableId: rowData.value.id,
+    tableName: rowData.value.processrouteCode
+  }
   titleNameRef.value = rowData.value.processrouteCode
   titleValueRef.value = rowData.value.processName
   processRouteId.value = rowData.value.id
@@ -142,6 +197,9 @@ const openDetail = async (rowData: any) => {
     graph.value.fromJSON(graphJson.cells)
   })
   getItembasicInfo(rowData.value.productCode)
+  getRemarkList()
+  getFileList()
+  getChangeRecordList()
 }
 //关闭后销毁图形组件
 const handleDrawerClose = () => {
@@ -277,6 +335,44 @@ const saveResult = async () => {
 // 验证图形
 onUnmounted(() => {})
 const emit = defineEmits(['close'])
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
 </script>
 <style lang="scss">
 .el-drawer__body {

src/views/mes/processroute/processroute.data.ts

@@ -80,7 +80,7 @@ export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '产品编码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '产品信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类

src/views/mes/productionPlan/index.vue

@@ -1,244 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="ProductionPlan.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ProductionPlan.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="ProductionPlanRules"
-    :formAllSchemas="ProductionPlan.allSchemas"
-    :apiUpdate="ProductionPlanApi.updateProductionPlan"
-    :apiCreate="ProductionPlanApi.createProductionPlan"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductionPlan.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/mes/productionPlan/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import { ProductionPlan,ProductionPlanRules } from './productionPlan.data'
-import * as ProductionPlanApi from '@/api/mes/productionPlan'
-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: 'MesProductionPlan' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(ProductionPlan.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: ProductionPlanApi.getProductionPlanPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'mes:productionPlan:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:productionPlan:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:productionPlan:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:productionPlan:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:productionPlan: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 =ProductionPlan.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 ProductionPlanApi.createProductionPlan(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ProductionPlanApi.updateProductionPlan(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, 'basicProductionPlan')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ProductionPlanApi.deleteProductionPlan(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 ProductionPlanApi.exportProductionPlan(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 ProductionPlanApi.importTemplate()
-})
-
-</script>

src/views/mes/productionPlan/productionPlan.data.ts

@@ -1,182 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-// 表单校验
-export const ProductionPlanRules = reactive({
-  endTime: [required],
-  concurrencyStamp: [required],
-})
-
-export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '计划编号',
-    field: 'planCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '计划名称',
-    field: 'planName',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '班组类型',
-    field: 'teamType',
-    sort: 'custom',
-    isSearch: true,
-                // form: {
-                //   component: 'SelectV2'
-                // },
-  },
-  {
-    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: 'shiftMode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '单据状态',
-    field: 'billState',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '删除时间',
-    field: 'deleteTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: 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: 'status',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: 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: 'deleter',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '位置ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '备用字段一',
-    field: 'textOne',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段二',
-    field: 'textTwo',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段三',
-    field: 'textThree',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))

src/views/mes/teamSetting/index.vue

@@ -1,244 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="TeamSetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="TeamSetting.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="TeamSettingRules"
-    :formAllSchemas="TeamSetting.allSchemas"
-    :apiUpdate="TeamSettingApi.updateTeamSetting"
-    :apiCreate="TeamSettingApi.createTeamSetting"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
-
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="TeamSetting.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/mes/teamSetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import { TeamSetting,TeamSettingRules } from './teamSetting.data'
-import * as TeamSettingApi from '@/api/mes/teamSetting'
-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: 'MesTeamSetting' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(TeamSetting.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: TeamSettingApi.getTeamSettingPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'mes:teamSetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:teamSetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:teamSetting:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:teamSetting:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'mes:teamSetting: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 =TeamSetting.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 TeamSettingApi.createTeamSetting(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await TeamSettingApi.updateTeamSetting(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, 'basicTeamSetting')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await TeamSettingApi.deleteTeamSetting(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 TeamSettingApi.exportTeamSetting(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 TeamSettingApi.importTemplate()
-})
-
-</script>

src/views/mes/teamSetting/teamSetting.data.ts

@@ -1,178 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-// 表单校验
-export const TeamSettingRules = reactive({
-  endTime: [required],
-  concurrencyStamp: [required],
-})
-
-export const TeamSetting = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '班组编号',
-    field: 'teamCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '班组名称',
-    field: 'teamName',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '班组类型',
-    field: 'teamType',
-    sort: 'custom',
-    isSearch: true,
-                // form: {
-                //   component: 'SelectV2'
-                // },
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: 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: 'textOne',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段二',
-    field: 'textTwo',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段三',
-    field: 'textThree',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段四',
-    field: 'textFour',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '备用字段五',
-    field: 'textFive',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '删除时间',
-    field: 'deleteTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: 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: 'status',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '删除用户名',
-    field: 'deleter',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '位置ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))

src/views/mes/workstation/index.vue

@@ -58,9 +58,50 @@
           :detailAllSchemasRules="WorkstationRules"
           :apiPage="apiPage"
           :tabs="TabsList"
-          :detailButtonIsShowAdd = "true"
-          :detailButtonIsShowDelete="true"
           @changeTabs="changeTabs"
+          :buttondataTable="buttondataTable"
+          @tableFormButton="tableFormButton"
+  />
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="teamRef"
+    @success="getList"
+    :tableAllSchemas="Team.allSchemas"
+    :tableData="selectTeamListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="equipmentListRef"
+    @success="getList"
+    :tableAllSchemas="Equipment.allSchemas"
+    :tableData="selectEquipmentListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="processListRef"
+    @success="getList"
+    :tableAllSchemas="Process.allSchemas"
+    :tableData="selectProcessListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="productionListRef"
+    @success="getList"
+    :tableAllSchemas="Production.allSchemas"
+    :tableData="selectProductionListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -82,17 +123,18 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import {
-  getEquipmentPage,
-  getProcessPage,
-  getProductionPage,
+  checkEquipmentPageList, checkProcessPageList, checkProductionPageList,
+  checkTeamPageList,
+  getEquipmentPage, getProcessPage, getProductionPage, getSelectEquipmentPage,
+  getSelectTeamPage,
   goalParams,
-  params
 } from "@/api/mes/workstation";
+import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const teamRef = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -283,4 +325,65 @@ const changeTabs = (data) =>{
     detailAllSchemas.value = Production.allSchemas
   }
 }
+const buttondataTable = ref([{
+  label: '取消关联',
+  name: 'viewParentPickingNumber',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+const teamListRef = ref()
+const { tableObject: selectTeamListTableData, tableMethods: selectTeamListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkTeamPageList
+})
+const { getList:selectTeamList } = selectTeamListTableMethods
+
+const equipmentListRef = ref()
+const { tableObject: selectEquipmentListTableData, tableMethods: selectEquipmentListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkEquipmentPageList
+})
+const { getList:selectEquipmentList } = selectEquipmentListTableMethods
+
+const processListRef = ref()
+const { tableObject: selectProcessListTableData, tableMethods: processListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProcessPageList
+})
+const { getList:selectProcessListList } = processListTableMethods
+
+const productionListRef = ref()
+const { tableObject: selectProductionListTableData, tableMethods: productionListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProductionPageList
+})
+const { getList:selectProductionList } = productionListTableMethods
+
+const tableFormButton = async (val , row) => {
+  if(val == 'Team'){
+    selectTeamListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectTeamList()
+    teamListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Equipment'){
+    selectEquipmentListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectEquipmentList()
+    equipmentListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Process'){
+    selectProcessListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProcessListList()
+    processListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Production'){
+    selectProductionListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProductionList()
+    productionListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
 </script>

src/views/mes/workstation/workstation.data.ts

@@ -105,6 +105,33 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+export const TeamSelect = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '代码',
     field: 'code',
@@ -134,6 +161,17 @@ export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
   }
 ]))
 export const Process = useCrudSchemas(reactive<CrudSchema[]>([
@@ -150,6 +188,17 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
   }
 ]))
 export const Production = useCrudSchemas(reactive<CrudSchema[]>([
@@ -166,5 +215,16 @@ export const Production = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
   }
 ]))

src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@@ -361,12 +361,12 @@ export const BusinesstypeRules = reactive({
   itemStatuses: [
     { required: true, message: '请选择可用物料状态范围', trigger: 'change' }
   ],
-  // outTransactionType: [
-  //   { required: true, message: '请输入出库事务类型', trigger: 'blur' }
-  // ],
-  // inTransactionType: [
-  //   { required: true, message: '请输入入库事务类型', trigger: 'blur' }
-  // ],
+  outTransactionType: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransactionType: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
   useOnTheWay: [
     { required: true, message: '请输入使用在途库', trigger: 'blur' }
   ],

src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts

@@ -99,8 +99,7 @@ export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 180

src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts

@@ -99,7 +99,6 @@ export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/basicDataManage/factoryModeling/location/location.data.ts

@@ -133,7 +133,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
   // {
   //   label: '类型',
   //   field: 'type',
-  //   dictType: DICT_TYPE.AREA_TYPE,
+  //   dictType: DICT_TYPE.LOCATION_TYPE,
   //   dictClass: 'string',
   //   isSearch: true,
   //   isTable: true,

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -206,6 +206,33 @@ const formsSuccess = async (formType,data) => {
       getList()
 }
 
+// 修改 tableform 属性
+Workstation.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'rawLocationCode') {
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'areaType',
+        value: 'RAW',
+      },
+      {
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+    if(item.field == 'fgLocationCode') {
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'areaType',
+        value: 'FG',
+      },
+      {
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+  })
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {

src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@@ -1,6 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
+import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
@@ -9,16 +10,14 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
-import * as confgiApi  from '@/api/infra/config'
 
 import * as WorkstationApi from '@/api/wms/workstation'
 
 import { validateYS } from '@/utils/validator'
-
+import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
+import * as TeamApi from "@/api/wms/team";
 
 const { t } = useI18n() // 国际化
-const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
-const confgiDataTwo = await confgiApi.queryByKey("WorkStation-OUT")
 
 /**
  * @returns {Array} 工位
@@ -126,16 +125,6 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'areaType',
-          value: confgiDataOne.areaType,
-          isMainValue: false
-        }]
       }
     }
   },
@@ -155,16 +144,6 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'areaType',
-          value: confgiDataTwo.areaType,
-          isMainValue: false
-        }]
       }
     }
   },

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -7,14 +7,12 @@ import { Itembasic } from '../itembasic/itembasic.data'
 import * as AreaApi from '@/api/wms/areabasic'
 import { Area } from '../../factoryModeling/areabasic/areabasic.data'
 
-import * as LocationgroupApi from '@/api/wms/locationgroup'
-import { Locationgroup } from '../../factoryModeling/locationgroup/locationgroup.data'
-
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '../../factoryModeling/location/location.data'
 
-import * as PackageunitApi from '@/api/wms/packageunit'
-import { Packageunit } from '../packageunit/packageunit.data'
+import * as ItempackageApi from '@/api/wms/itempackage'
+import { Itempackaging } from '../itempackage/itempackage.data'
+import { t } from '@/hooks/web/useI18n'
 
 export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -97,15 +95,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格基础信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: "请选择物料代码",
+          isMainValue: true
         }]
       }
     }
@@ -122,15 +124,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格基础信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchTitle: '物料包装信息', // 查询弹窗标题
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          isMainValue: false
+        },{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: "请选择物料代码",
+          isMainValue: true
         }]
       }
     }
@@ -377,7 +383,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     form: {
       component: 'Switch',
-      value: 'FALSE',
+      value: 'TRUE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -395,7 +401,8 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        activeValue: 'TRUE',
+        disabled: 'TRUE',
       }
     },
   },
@@ -422,7 +429,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -32,6 +32,8 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
+          action: '==',
+          isSearch: true,
           isMainValue: false
         }]
       }

src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@@ -2,10 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
 import * as PackageunitApi from '@/api/wms/packageunit'
-import { Select } from '@element-plus/icons-vue/dist/types'
 
-//新增时针对父包装代码copy出的实体
-export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
+export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装代码',
     field: 'code',
@@ -15,14 +13,29 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '父包装代码',
-    field: 'parentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '父包装代码',
+  //   field: 'parentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择父包装代码',
+  //       searchField: 'code',
+  //       searchTitle: '包装规格信息',
+  //       searchAllSchemas: PackageunitCopy.allSchemas,
+  //       searchPage: PackageunitApi.getPackageunitPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '包装名称',
     field: 'name',
@@ -83,12 +96,6 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单位',
     field: 'unit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '是否可用',
@@ -112,7 +119,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装描述',
     field: 'desc',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
@@ -123,7 +130,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: false,
+    isSearch: true,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -142,7 +149,7 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: false,
+    isSearch: true,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -278,7 +285,25 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 
-export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
+// 表单校验
+export const PackageunitRules = reactive({
+  code: [
+    { required: true, message: '请输入包装代码', trigger: 'change' }
+  ],
+  name: [
+    { required: true, message: '请输入包装名称', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择包装类型', trigger: 'change' }
+  ],
+  desc: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { required: true, message: '请输入包装描述', trigger: 'change' }
+  ],
+})
+
+//已取消  保留只是为了预防日后使用
+export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装代码',
     field: 'code',
@@ -294,21 +319,6 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择父包装代码',
-        searchField: 'code',
-        searchTitle: '包装规格信息',
-        searchAllSchemas: PackageunitCopy.allSchemas,
-        searchPage: PackageunitApi.getPackageunitPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
     }
   },
   {
@@ -371,12 +381,6 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单位',
     field: 'unit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: false,
-    table: {
-      width: 150
-    },
   },
   {
     label: '是否可用',
@@ -400,7 +404,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装描述',
     field: 'desc',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
@@ -411,7 +415,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: false,
+    isSearch: true,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -430,7 +434,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: false,
+    isSearch: true,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -565,21 +569,3 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-
-// 表单校验
-export const PackageunitRules = reactive({
-  code: [
-    { required: true, message: '请输入包装代码', trigger: 'change' }
-  ],
-  name: [
-    { required: true, message: '请输入包装名称', trigger: 'change' }
-  ],
-  type: [
-    { required: true, message: '请选择包装类型', trigger: 'change' }
-  ],
-  desc: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { required: true, message: '请输入包装描述', trigger: 'change' }
-  ],
-})
-

src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@@ -1,15 +1,17 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from './../../factoryModeling/location/location.data'
+
 import * as ProductionLineCodeApi from '@/api/wms/productionline'
 import { Productionline } from './../../factoryModeling/productionline/productionline.data'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from './../itembasic/itembasic.data'
-import * as confgiApi  from '@/api/infra/config'
-const { t } = useI18n() // 国际化
 
-
-const confgiData = await confgiApi.queryByKey("Productionlineitem")
+import { ElButton, ElInput } from 'element-plus'
+const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 生产线物料关系
@@ -110,8 +112,15 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
         },
         {
           key:'type',
-          value:confgiData.itemType,
-          action: 'notin',
+          value:'OTS',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },
+        {
+          key:'type',
+          value:'RAW',
+          action: '!=',
           isSearch: true,
           isMainValue: false
         },

src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@@ -343,8 +343,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },

src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@@ -352,8 +352,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -319,7 +319,7 @@ export const SupplieritemRules = reactive({
   ],
   supplierItemCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   // packUnit: [
   //   { required: true, message: '请选择供应商包装单位', trigger: 'change' }

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -143,7 +143,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -154,7 +154,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/countManage/count/countJobMain/index.vue

@@ -71,7 +71,7 @@ import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } fro
 import * as CountJobMainApi from '@/api/wms/countJobMain'
 import * as CountJobDetailApi from '@/api/wms/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
 
@@ -209,13 +209,10 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

src/views/wms/countManage/count/countRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CountRecordMain,CountRecordMainRules,CountRecordDetail,CountRecordDetai
 import * as CountRecordMainApi from '@/api/wms/countRecordMain'
 import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 盘点记录主
 defineOptions({ name: 'CountRecordMain' })
 
@@ -147,13 +147,10 @@ const buttonTableClick = async (val, row) => {
     })
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts

@@ -268,8 +268,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     form: {
       component: 'Switch',
       value: requestsettingData.directCreateRecord,

src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CountadjustRecordMain,CountadjustRecordMainRules,CountadjustRecordDetai
 import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain'
 import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 盘点调整记录主
 defineOptions({ name: 'CountadjustRecordMain' })
 
@@ -132,13 +132,10 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@@ -254,8 +254,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     form: {
       component: 'Switch',
       value: requestsettingData.directCreateRecord,

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -180,7 +180,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -199,7 +199,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CustomerreceiptRecordMain,CustomerreceiptRecordMainRules,Customerreceip
 import * as CustomerreceiptRecordMainApi from '@/api/wms/customerreceiptRecordMain'
 import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 客户收货记录主
 defineOptions({ name: 'CustomerreceiptRecordMain' })
 
@@ -132,13 +132,10 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreceiptMain')
 }
 

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -174,7 +174,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     isForm: false,
@@ -186,7 +186,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -319,8 +319,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@@ -181,7 +181,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -192,7 +192,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@@ -71,7 +71,7 @@ import { CustomerreturnJobMain,CustomerreturnJobMainRules,CustomerreturnJobDetai
 import * as CustomerreturnJobMainApi from '@/api/wms/customerreturnJobMain'
 import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
 
@@ -327,13 +327,10 @@ const buttonTableClick = async (val, row) => {
     })
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'jobCustomerreturnMain')
 }
 

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -189,7 +189,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -208,7 +208,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -67,7 +67,7 @@ import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRe
 import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
 import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
 
@@ -136,13 +136,10 @@ const buttonTableClick = async (val, row) => {
     handlePoint(row)
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'recordCustomerreturnMain')
 }
 

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -285,7 +285,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -297,7 +297,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -436,8 +436,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts

@@ -141,7 +141,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CustomersettleRecordMain,CustomersettleRecordMainRules,CustomersettleRe
 import * as CustomersettleRecordMainApi from '@/api/wms/customersettleRecordMain'
 import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 客户结算记录主
 defineOptions({ name: 'CustomersettleRecordMain' })
 
@@ -132,13 +132,10 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'recordCustomersettleMain')
 }
 

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts

@@ -134,7 +134,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -265,8 +265,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@@ -180,7 +180,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -191,7 +191,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -761,14 +761,6 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',

src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@@ -71,7 +71,7 @@ import { DeliverJobMain,DeliverJobMainRules,DeliverJobDetail,DeliverJobDetailRul
 import * as DeliverJobMainApi from '@/api/wms/deliverJobMain'
 import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 发货任务主
 defineOptions({ name: 'DeliverJobMain' })
 
@@ -180,53 +180,53 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
-    let aaa = {
-  "id": 3,
-  "requestNumber": "REQ1720240326-0012",
-  "deliverPlanNumber": "",
-  "customerDeliverNumber": "CUST20240326-00000012",
-  "customerCode": "KHV",
-  "customerDockCode": "YTV4",
+    let aaa = {
+    "id": "1809190002130023685",
+    "requestNumber": "REQ1720231222-0004",
+    "deliverPlanNumber": "DP20231222-0004",
+    "customerDeliverNumber": "CUST20231222-00000005",
+    "customerCode": "CF",
+    "customerDockCode": "CFCKYT",
     "deliverDock": null,
-  "carrierCode": "",
-  "transferMode": "",
-  "vehiclePlateNumber": "",
+    "carrierCode": null,
+    "transferMode": null,
+    "vehiclePlateNumber": null,
     "fromWarehouseCode": null,
-  "toWarehouseCode": "CKV",
-  "requestTime": 1711443936000,
-  "requestDueTime": null,
+    "toWarehouseCode": "CFCK",
+    "requestTime": 1703207798000,
+    "requestDueTime": 1703952000000,
     "status": "2",
     "expiredTime": null,
-  "updateTime": 1711443936000,
+    "updateTime": 1703207917000,
     "updater": "超级管理员",
     "jobStageStatus": null,
     "priority": null,
     "priorityincrement": null,
     "departmentCode": "100",
     "acceptUserId": "1",
-  "acceptTime": 1711443941000,
+    "acceptTime": 1703207934000,
     "completeUserId": null,
     "completeTime": null,
-  "fromAreaTypes": "FG,STOCK_UP",
-  "toAreaTypes": "CUST,THIRD_PARTY",
-  "number": "JOB2420240326-0013",
-  "businessType": "Deliver",
+    "fromAreaTypes": "FG",
+    "toAreaTypes": "CUST",
+    "number": "JOB2420231222-0006",
+    "businessType": "DeliverJob",
     "remark": "",
-  "createTime": 1711443936000,
+    "createTime": 1703207917000,
     "creator": "超级管理员",
     "ruleUserId": null,
-  "fromAreaCodes": "FG",
-  "toAreaCodes": "CUST,ZTQ",
+    "fromAreaCodes": "采购在途库",
+    "toAreaCodes": "采购在途库",
     "fromDockCode": null,
     "autoComplete": "FALSE",
     "allowModifyLocation": "FALSE",
@@ -241,48 +241,51 @@ const buttonTableClick = async (val, row) => {
     "inInventoryStatuses": "OK",
     "outInventoryStatuses": "OK",
     "concurrencyStamp": 1,
-  "useOnTheWayLocation": null,
     "subList": [{
-  "id": 3,
+    "id": "1809190001245559379",
     "soNumber": null,
     "soLine": null,
     "packingNumber": null,
-  "batch": "2024021801",
+    "batch": "20230808",
     "inventoryStatus": "OK",
     "ownerCode": null,
     "containerNumber": null,
-  "fromLocationCode": "FG",
-  "toLocationCode": "SFK",
-  "itemCode": "vvcs-zhj1",
-  "itemName": "测试物件",
-  "itemDesc1": "水冷系-散热器",
-  "itemDesc2": "水冷系-散热器",
-  "projectCode": "PJ001",
-  "qty": 11,
-  "uom": "PC",
-  "number": "JOB2420240326-0013",
+    "fromLocationCode": "L-R-001-001-1-01",
+    "toLocationCode": "CUST",
+    "itemCode": "testCF",
+    "itemName": "陈放测试物料",
+    "itemDesc1": "测试用",
+    "itemDesc2": "测试用",
+    "projectCode": "5",
+    "qty": 5,
+    "uom": "EA",
+    "number": "JOB2420231222-0006",
     "remark": "",
-  "createTime": 1711443936000,
+    "createTime": 1703207917000,
     "creator": "超级管理员",
     "toPackingNumber": null,
     "toContainerNumber": null,
     "toBatch": null,
     "handleQty": null,
     "toInventoryStatus": null,
-  "updateTime": 1711443936000,
-  "updater": "超级管理员",
-  "onTheWayLocationCode": "FHZTK",
         recordList: [{
-            handleQty: 11,
-            toPackingNumber: null,
-            toContainerNumber: null,
-            toBatch: '2024021801',
+            handleQty: 10,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'H03',
+            supplierCode: '31213',
+          },{
+            handleQty: 22,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
             toInventoryStatus: 'OK',
-            toLocationCode: "SFK",
+            toLocationCode: 'SFG',
             supplierCode: '31213',
           }]
-    }
-  ]
+      }]
 }
     handleHandle(aaa)
     console.log('列表-操作按钮事件-执行')
@@ -294,13 +297,10 @@ const buttonTableClick = async (val, row) => {
     DeliverJobMainApi.acceptDeliverJobMain(row.id)
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-   const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'jobDeliverMain')
 }
 

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -189,7 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -200,7 +200,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -516,14 +516,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@@ -67,7 +67,7 @@ import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRec
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 发货记录主
 defineOptions({ name: 'DeliverRecordMain' })
 
@@ -136,13 +136,10 @@ const buttonTableClick = async (val, row) => {
     handlePoint(row)
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
 }
 

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -19,9 +19,6 @@ import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/cu
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
-import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
-
-import * as WorkstationApi from '@/api/wms/workstation'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -169,16 +166,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '发货类型',
-    field: 'deliverType',
-    sort: 'custom',
-    dictType: DICT_TYPE.DELIVER_TYPE,
-    dictClass: 'string',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -213,15 +200,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '发货库区类型',
-    field: 'deliverType',
-    sort: 'custom',
-    dictType: DICT_TYPE.DELIVER_TYPE,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -294,7 +272,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -306,7 +284,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -445,8 +423,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -549,9 +526,6 @@ export const DeliverRequestMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
   ],
-  deliverType: [
-    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
-  ],
   customerDockCode: [
     { required: true, message: '请选择客户月台代码', trigger: 'change' }
   ],
@@ -808,8 +782,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
-      type: 'Select',
-      disabled: true
+      type: 'Select'
     },
     form: {
       componentProps: {
@@ -824,44 +797,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'areaType',
-        value: "deliverType",
-        message:"请选择发货类型",
-        isMainValue: true
-    }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位基础信息',
-        searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'areaType',
-          value: "deliverType",
-          message:"请选择发货类型",
-          isMainValue: false
-      }]
-      }
-    },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '库存状态',
@@ -1028,7 +965,4 @@ export const DeliverRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  toLocationCode: [
-    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ],
 })

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -10,15 +10,8 @@ import { Customerdock } from '@/views/wms/basicDataManage/customerManage/custome
 import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
 
-
-import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
-
-import * as WorkstationApi from '@/api/wms/workstation'
-
 import * as getPlansettingApi  from '@/api/wms/plansetting/index'
 
-import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
-
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -30,13 +23,6 @@ const queryParams = {
  const data = await getPlansettingApi.getPlansettingPage(queryParams)
  const plansettingData =data?.list[0]||{}
 
- const businessTypeQueryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'Deliver'
-}
-const data1 = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
-const businessTypeData =data1?.list[0]||{}
 /**
  * @returns {Array} 发货计划主表
  */
@@ -77,16 +63,6 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '发货类型',
-    field: 'deliverType',
-    sort: 'custom',
-    dictType: DICT_TYPE.DELIVER_TYPE,
-    dictClass: 'string',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '计划日期',
     field: 'planDate',
@@ -341,9 +317,6 @@ export const DeliverPlanMainRules = reactive({
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'change' }
   ],
-  deliverType: [
-    { required: true, message: '发货库区类型不能为空', trigger: 'change' }
-  ],
   planDate: [
     { required: true, message: '计划日期不能为空', trigger: 'change' }
   ],
@@ -432,6 +405,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
+        isMainValue: false
       },{
         key: 'customerCode',
         value: 'customerCode',
@@ -526,52 +500,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'areaType',
-        value: "deliverType",
-        message:"请选择发货类型",
-        isMainValue: true
-    }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位基础信息',
-        searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'areaType',
-          value: "deliverType",
-          message:"请选择发货类型",
-          isMainValue: false
-      }]
-      }
-    },
-  },
   {
     label: '备注',
     field: 'remark',
@@ -729,9 +657,6 @@ export const DeliverPlanDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-  toLocationCode: [
-    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ],
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -357,8 +357,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@@ -71,7 +71,6 @@ import { StockupMainJob,StockupMainJobRules,StockupDetailJob,StockupDetailJobRul
 import * as StockupJobMainApi from '@/api/wms/stockupMainJob'
 import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货任务主
 defineOptions({ name: 'StockupJobMain' })
@@ -181,17 +180,110 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
-    handleHandle
+    let aaa = {
+  "id": 6,
+  "requestNumber": "REQ4520240313-0003",
+  "deliverPlanNumber": null,
+  "fromWarehouseCode": "CKV",
+  "toWarehouseCode": "CKV",
+  "details": null,
+  "requestTime": null,
+  "requestDueTime": null,
+  "status": "1",
+  "expiredTime": null,
+  "concurrencyStamp": "1",
+  "jobStageStatus": null,
+  "priority": null,
+  "priorityincrement": null,
+  "departmentCode": null,
+  "userGroupCode": null,
+  "acceptUserId": null,
+  "acceptUserName": null,
+  "acceptTime": null,
+  "completeUserId": null,
+  "completeUserName": null,
+  "completeTime": null,
+  "fromAreaTypes": "FG",
+  "toAreaTypes": "CUST",
+  "number": "JOB3220240314-0006",
+  "businessType": "Stockup",
+  "remark": null,
+  "extraProperties": null,
+  "siteId": null,
+  "autoComplete": "FALSE",
+  "allowModifyLocation": "FALSE",
+  "allowModifyQty": "TRUE",
+  "allowBiggerQty": "TRUE",
+  "allowSmallerQty": "TRUE",
+  "allowModifyInventoryStatus": "TRUE",
+  "allowContinuousScanning": "TRUE",
+  "allowPartialComplete": "TRUE",
+  "ruleUserId": null,
+  "allowModifyBatch": "FALSE",
+  "allowModifyPackingNumber": "FALSE",
+  "fromAreaCodes": "KQV2",
+  "toAreaCodes": "CUST",
+  "serialNumber": "0",
+  "inInventoryStatuses": "OK",
+  "outInventoryStatuses": "OK",
+  "createTime": null,
+    "subList": [{
+  "id": 1,
+  "packingNumber": null,
+  "batch": "2024021801",
+  "inventoryStatus": "OK",
+  "ownerCode": null,
+  "containerNumber": null,
+  "fromLocationCode": "FG",
+  "toLocationCode": "RAW",
+  "itemCode": "FOG-LAMP-RIGHT",
+  "itemName": "HL后雾灯（新）-右\r\n",
+  "itemDesc1": "HL后雾灯（新）-右\r\n",
+  "itemDesc2": "HL后雾灯（新）-右\r\n",
+  "projectCode": "PJ001",
+  "qty": 1,
+  "uom": "EA",
+  "masterId": 6,
+  "number": "JOB3220240314-0006",
+  "remark": null,
+  "siteId": "",
+  "createTime": null,
+    "toPackingNumber": null,
+    "toContainerNumber": null,
+    "toBatch": null,
+    "handleQty": null,
+    "toInventoryStatus": null,
+        recordList: [{
+            handleQty: 10,
+            toPackingNumber: '12',
+            toContainerNumber: '001',
+            toBatch: '21',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'WIP',
+            supplierCode: '31213',
+          },{
+            handleQty: 22,
+            toPackingNumber: 'M20230421000005',
+            toContainerNumber: '001',
+            toBatch: '20230808',
+            toInventoryStatus: 'OK',
+            toLocationCode: 'FG',
+            supplierCode: '31213',
+          }]
+      }]
+}
+    handleHandle(aaa)
+    console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     StockupJobMainApi.abandonStockupMainJob(row.id)
   } else if (val == 'mainJobClo') { // 关闭
@@ -200,14 +292,11 @@ const buttonTableClick = async (val, row) => {
     StockupJobMainApi.acceptStockupMainJob(row.id)
   }
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainJob')
+  detailRef.value.openDetail(row, titleName, titleValue,'jobStockupMain')
 }
 
 const handleHandle = async (data) => {

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -12,67 +12,42 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '发货记录单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 180
-    },
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '状态',
     field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
+
+    form: {
+      component: 'Radio'
     },
-    isForm: false,
   },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -94,9 +69,6 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestDueTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -119,9 +91,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expiredTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -142,23 +112,20 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+
   },
   {
     label: '承接人用户名',
     field: 'acceptUserName',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '承接时间',
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -179,18 +146,12 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人用户名',
     field: 'completeUserName',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '完成时间',
     field: 'completeTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -210,26 +171,12 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
   },
   {
     label: '业务类型',
@@ -238,62 +185,48 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
                 form: {
                   component: 'SelectV2'
                 },
-                table: {
-                  width: 120
-                },
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     sort: 'custom',
-    table: {
-      width: 120
-    },
+
   },
   {
     label: '允许修改库位',
     field: 'allowModifyLocation',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '允许修改数量',
     field: 'allowModifyQty',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '允许大于推荐数量',
     field: 'allowBiggerQty',
     sort: 'custom',
-    table: {
-      width: 180
-    },
+
   },
   {
     label: '允许小于推荐数量',
     field: 'allowSmallerQty',
     sort: 'custom',
-    table: {
-      width: 180
-    },
+
   },
   {
     label: '允许修改库存状态',
     field: 'allowModifyInventoryStatus',
     sort: 'custom',
-    table: {
-      width: 180
-    },
+
     form: {
       component: 'Radio'
     },
@@ -302,82 +235,61 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     label: '允许连续扫描',
     field: 'allowContinuousScanning',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '允许部分完成',
     field: 'allowPartialComplete',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '允许修改批次',
     field: 'allowModifyBatch',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '允许修改箱码',
     field: 'allowModifyPackingNumber',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
-    table: {
-      width: 150
+
   },
+  {
+    label: '工作流流水号',
+    field: 'serialNumber',
+    sort: 'custom',
+
   },
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
     sort: 'custom',
-    table: {
-      width: 180
-    },
+
   },
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
     sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    table: {
-      width: 180
-    },
+
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -409,27 +321,18 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '库存状态',
@@ -439,90 +342,60 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Radio'
     },
-    table: {
-      width: 120
-    },
   },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 150
-    },
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
     isSearch: true,
-    table: {
-      width: 120
-    },
   },
   {
     label: '数量',
@@ -533,22 +406,18 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
+    isSearch: true,
   },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
     form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+      component: 'InputNumber',
+      value: 0
+    },
   },
   {
     label: '备注',
@@ -570,9 +439,6 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 180
-    },
     isForm: false,
   },
   {

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@@ -66,7 +66,6 @@ import { StockupMainRecord,StockupMainRecordRules,StockupDetailRecord,StockupDet
 import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord'
 import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货记录主
 defineOptions({ name: 'StockupMainRecord' })
@@ -133,14 +132,11 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRecord')
+  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
 }
 
 /** 导出按钮操作 */

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -16,15 +16,6 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '发货记录单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -63,64 +54,17 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
     table: {
       width: 150
     },
-    isForm: false,
   },
   {
     label: '入库事务类型',
     field: 'inTransactionType',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
-  },
-  {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '到库区类型范围',
-    field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
   },
   {
     label: '执行时间',
@@ -208,22 +152,23 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    formatter: dateFormatter,
-    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')]
-      }
-    },
     table: {
-      width: 180
+      width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '部门',
@@ -253,31 +198,63 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
-      width: 150
+      width: 100
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
   {
-    label: '备注',
-    field: 'remark',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 100
+      width: 180
+    },
   },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
   },
   {
     label: '操作',
@@ -322,6 +299,26 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -332,8 +329,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -341,8 +338,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -350,8 +347,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -359,8 +356,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -368,8 +365,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '到器具号',
+    field: 'toContainerNumber',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -377,8 +374,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -386,30 +383,26 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '单价',
+    field: 'singlePrice',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -417,8 +410,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '金额',
+    field: 'amount',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -426,8 +419,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -435,17 +428,27 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '创建时间',
+    field: 'createTime',
     sort: 'custom',
+    formatter: dateFormatter,
     isSearch: true,
     table: {
-      width: 150
+      width: 180
+    },
+    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: 'toOwnerCode',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -453,8 +456,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '物品名称',
+    field: 'itemName',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -462,8 +465,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -471,8 +474,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -480,8 +483,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -489,8 +492,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单价',
-    field: 'singlePrice',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     isSearch: true,
     table: {
@@ -498,10 +501,12 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -537,34 +542,6 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    table: {
-      width: 180
-    },
-    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: 'remark',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '操作',
     field: 'action',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -90,8 +90,6 @@ 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 DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
-import {DeliverRequestDetail} from '../../deliver/deliverRequestMain/deliverRequestMain.data'
-
 // 备货申请
 defineOptions({ name: 'StockupMainRequest' })
 
@@ -149,7 +147,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           })
           if (res) tableData.value = res
           // 修改 tableform 属性
-          StockupDetailRequest.allSchemas.tableFormColumns.map(item => {
+          DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
             if(item.field == 'itemCode') {
               item.isInpuFocusShow = false
               item.tableForm.isInpuFocusShow = false
@@ -423,24 +421,24 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
-   if(rs.length > 1) isExist = true
-  })
-  if (isExist) {
-    formRef.value.formLoading = false
-    return message.warning('物料代码重复')
-  }
-  data.subList.forEach(obj => {
-    if(obj.qty == 0){
-      message.warning(`数量不能为0!`)
-      flag.value = true
-      return;
-    }
+  //  let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
+  //  if(rs.length > 1) isExist = true
+  // })
+  // if (isExist) {
+  //   formRef.value.formLoading = false
+  //   return message.warning('物料代码重复')
+  // }
+  // data.subList.forEach(obj => {
+  //   if(obj.qty == 0){
+  //     message.warning(`数量不能为0!`)
+  //     flag.value = true
+  //     return;
+  //   }
   })
-  if(flag.value){
-    formRef.value.formLoading = false
-    return
-  }
+  // if(flag.value){
+  //   formRef.value.formLoading = false
+  //   return
+  // }
   try {
     if (formType === 'create') {
       if(tableData.value.length <= 0){

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -4,15 +4,12 @@ import { TableColumn } from '@/types/table'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
-import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 import * as  locationApi from '@/api/wms/location'
 import { Location } from '../../../basicDataManage/factoryModeling/location/location.data'
 
-import * as  ItemBasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data'
-
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -26,7 +23,6 @@ const queryParams = {
 
   // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
-import { ItemBasic } from '@/utils/disposition/formFields'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -52,35 +48,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '发货计划信息', // 查询弹窗标题
-        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'status',
-          value: '6',
-          isMainValue: false
-        }]
-      }
-    }
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -120,7 +87,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -356,8 +323,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       field: 'directCreateRecord',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
-      isForm: false,
-      isTable: false,
+      isTable: true,
       sort: 'custom',
       table: {
         width: 150
@@ -372,10 +338,11 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         }
       }
     },
+
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.AREA_TYPE,
+    dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -390,7 +357,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 120
     },
     isForm: false
   },
@@ -473,129 +440,109 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTableForm: false,
     table: {
-      width: 180
+      width: 100
     },
   },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage,
+      searchCondition: [
       //   {
-  //   label: '包装号',
-  //   field: 'packingNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   tableForm:{
-  //     isInpuFocusShow: true, // 开启查询弹窗
-  //     searchListPlaceholder: '请选择包装号',
-  //     searchField: 'packingNumber',
-  //     searchTitle: '库存余额信息',
-  //     searchAllSchemas: Balance.allSchemas,
-  //     searchPage: BalanceApi.getBalanceItemPage,
-  //     searchCondition: [
-  //     //   {
-  //     //   key:'customerCode', // 查询列表中字段
-  //     //   value:'customerCode', // 指主表某字段 
-  //     //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-  //     //   isMainValue: true // 表示查询条件是主表的字段的值
-  //     // }
-  //   ]
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择包装号',
-  //       searchField: 'packingNumber',
-  //       searchTitle: '库存余额信息',
-  //       searchAllSchemas: Balance.allSchemas,
-  //       searchPage: BalanceApi.getBalanceItemPage,
-  //       searchCondition: [
-  //       //   {
-  //       //   key:'customerCode', // 查询列表中字段
-  //       //   value:'customerCode', // 指主表某字段 
-  //       //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-  //       //   isMainValue: true // 表示查询条件是主表的字段的值
-  //       // }
-  //     ]
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '器具号',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 100
-  //   },
-  //   isSearch: true,
-  // },
-  // {
-  //   label: '批次',
-  //   field: 'batch',
-  //   sort: 'custom',
-  //   isSearch: true,
-  //   tableForm: {
-  //     disabled: true,
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
+      //   key:'customerCode', // 查询列表中字段
+      //   value:'customerCode', // 指主表某字段 
+      //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+      //   isMainValue: true // 表示查询条件是主表的字段的值
       // }
-  //   }
-  // },
+    ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalanceItemPage,
+        searchCondition: [
         //   {
-  //   label: '库存状态',
-  //   field: 'inventoryStatus',
-  //   dictType: DICT_TYPE.INVENTORY_STATUS,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 120
-  //   },
-  //   tableForm: {
-  //     disabled: true,
-  //     type: 'Select'
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
+        //   key:'customerCode', // 查询列表中字段
+        //   value:'customerCode', // 指主表某字段 
+        //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+        //   isMainValue: true // 表示查询条件是主表的字段的值
         // }
-  //   }
-  // },
+      ]
+      }
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 100
+    },
+    isSearch: true,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 120
     },
     tableForm: {
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',
-      searchField: 'itemCode',
-      searchTitle: '物料基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItemBasicApi.getItembasicPage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
+      disabled: true
     },
     form: {
       componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
-        searchField: 'itemCode',
-        searchTitle: '物料基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItemBasicApi.getItembasicPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        disabled: true
       }
     }
   },
@@ -606,7 +553,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTableForm: false,
     table: {
-      width: 150
+      width: 120
     },
   },
   {

src/views/wms/inventoryManage/package/package.data.ts

@@ -207,11 +207,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    // form: {
-    //   component: 'SelectV2'
-    // },
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
     table: {
       width: 150,
     },

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@@ -66,7 +66,7 @@ import { InventoryinitRecordMain,InventoryinitRecordMainRules,InventoryinitRecor
 import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
 import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
 // 库存初始化记录主
 defineOptions({ name: 'InventoryinitRecordMain' })
 
@@ -132,13 +132,10 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-// 获取部门 用于详情 部门回显
-const { wsCache } = useCache()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
-  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'recordInventoryinitMain')
 }
 

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts

@@ -369,8 +369,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -238,8 +238,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
-    isTable: false,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -530,8 +529,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格',
     field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {