解决冲突

.env.development

@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://localhost:12080'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

.env.prod

@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

.env.test

@@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

.env.test-scp

@@ -38,7 +38,7 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311'
 
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

README.md

@@ -31,6 +31,7 @@ form: {
           isFormModel:true, // filters中添加筛选的数据--取于formModel
           required:true, // 前置添加必有，和isFormModel结合使用
           message: '请选择客户代码！', // 前置添加没填的提示语
+          
         },
         {
           key: 'itemCode',
@@ -44,7 +45,16 @@ form: {
           value:'TRUE', // 指查询具体值
           isMainValue: false // 表示查询条件不是主表的字段的值
         }
-      ]
+      ],
+      // 失去焦点校验参数
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }]
     }
 }
 **tableForm明细列表查询弹窗配置**

package.json

@@ -55,6 +55,7 @@
     "vue": "^3.3.4",
     "vue-dompurify-html": "^4.1.4",
     "vue-i18n": "^9.4.1",
+    "vue-next-focus": "^0.0.12",
     "vue-router": "^4.2.5",
     "vue-types": "^5.1.1",
     "vuedraggable": "^4.1.0",

src/api/eam/basicEamProductionline/index.ts

@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+import {BasicEamWorkshopVO} from "@/api/eam/basicEamWorkshop";
+
+export interface BasicEamProductionlineVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  type: string
+  workshopCode: string
+  rawLocationCode: string
+  fgLocationCode: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询生产线列表
+export const getBasicEamProductionlinePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-eam-productionline/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-eam-productionline/page`, params })
+  }
+}
+
+// 查询生产线详情
+export const getBasicEamProductionline = async (id: number) => {
+  return await request.get({ url: `/eam/basic-eam-productionline/get?id=` + id })
+}
+
+// 新增生产线
+export const createBasicEamProductionline = async (data: BasicEamProductionlineVO) => {
+  return await request.post({ url: `/eam/basic-eam-productionline/create`, data })
+}
+
+// 修改生产线
+export const updateBasicEamProductionline = async (data: BasicEamProductionlineVO) => {
+  return await request.put({ url: `/eam/basic-eam-productionline/update`, data })
+}
+
+// 删除生产线
+export const deleteBasicEamProductionline = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-eam-productionline/delete?id=` + id })
+}
+
+// 导出生产线 Excel
+export const exportBasicEamProductionline = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-eam-productionline/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-eam-productionline/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-eam-productionline/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicEamProductionlineVO) => {
+  return await request.post({ url: `/eam/basic-eam-productionline/ables` , data })
+}

src/api/eam/basicEamWorkshop/index.ts

@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface BasicEamWorkshopVO {
+  id: number
+  code: string
+  name: string
+  description: string
+  type: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询EAM车间列表
+export const getBasicEamWorkshopPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/basic-eam-workshop/senior', data })
+  } else {
+    return await request.get({ url: `/eam/basic-eam-workshop/page`, params })
+  }
+}
+
+// 查询EAM车间详情
+export const getBasicEamWorkshop = async (id: number) => {
+  return await request.get({ url: `/eam/basic-eam-workshop/get?id=` + id })
+}
+
+// 新增EAM车间
+export const createBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/create`, data })
+}
+
+// 修改EAM车间
+export const updateBasicEamWorkshop = async (data: BasicEamWorkshopVO) => {
+  return await request.put({ url: `/eam/basic-eam-workshop/update`, data })
+}
+
+// 删除EAM车间
+export const deleteBasicEamWorkshop = async (id: number) => {
+  return await request.delete({ url: `/eam/basic-eam-workshop/delete?id=` + id })
+}
+
+// 导出EAM车间 Excel
+export const exportBasicEamWorkshop = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/basic-eam-workshop/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/basic-eam-workshop/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/basic-eam-workshop/get-import-template' })
+}
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: BasicEamWorkshopVO) => {
+  return await request.post({ url: `/eam/basic-eam-workshop/ables` , data })
+}

src/api/eam/classTypeRole/index.ts

@@ -62,3 +62,9 @@ export const exportClassTypeRole = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/eam/basic/class-type-role/get-import-template' })
 }
+
+
+// 启用 / 禁用
+export const updateEnableCode = async (data: ClassTypeRoleVO) => {
+  return await request.post({ url: `/eam/basic/class-type-role/ables` , data })
+}

src/api/eam/documentTypeSelectSet/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {BasicSpotCheckSelectSetVO} from "@/api/eam/spotCheckSelectSet";
 
 export interface DocumentTypeSelectSetVO {
   id: number

src/api/eam/equipmentAccounts/index.ts

@@ -15,6 +15,7 @@ export interface EquipmentAccountsVO {
   principal: string
   principalTelephone: string
   status: string
+  changeReason: string
   startDate: Date
   supplierCode: string
   purchaseTime: Date
@@ -82,3 +83,8 @@ export const importTemplate = () => {
 export const getEquipmentAccountsNoPage = async (params) => {
   return await request.get({ url: `/eam/device/equipment-accounts/noPage`, params })
 }
+
+//停用启用
+export const ableEquipmentAccountsMain = async (data: EquipmentAccountsVO) => {
+  return await request.post({ url: `/eam/device/equipment-accounts/ables`, data })
+}

src/api/eam/equipmentInspectionMain/index.ts

@@ -68,9 +68,9 @@ export const updateEquipmentInspectionMain = async (data: EquipmentInspectionMai
   return await request.put({ url: `/eam/equipment-inspection-main/update`, data })
 }
 
-// 修改巡检工单主
-export const updateEquipmentInspection = async (data: EquipmentInspectionMainVO) => {
-  return await request.post({ url: `/eam/equipment-inspection-main/updateOrders`, data })
+// 验证巡检工单主
+export const verifyEquipmentInspectionMain = async (data: EquipmentInspectionMainVO) => {
+  return await request.post({ url: `/eam/equipment-inspection-main/verifyOrder`, data })
 }
 
 // 删除巡检工单主

src/api/eam/equipmentMaintenanceMain/index.ts

@@ -70,9 +70,9 @@ export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceM
   return await request.put({ url: `/eam/equipment-maintenance-main/update`, data })
 }
 
-// 修改设备保养工单主
-export const updateEquipmentMaintenance = async (data: EquipmentMaintenanceMainVO) => {
-  return await request.post({ url: `/eam/equipment-maintenance-main/updateOrders`, data })
+// 验证设备保养工单主
+export const verifyEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/equipment-maintenance-main/verifyOrder`, data })
 }
 
 // 删除设备保养工单主

src/api/eam/equipmentRepairJobMain/index.ts

@@ -69,6 +69,11 @@ export const createEquipmentRepairJobMain = async (data: EquipmentRepairJobMainV
   return await request.post({ url: `/eam/equipment-repair-job-main/create`, data })
 }
 
+// 维修验证更新工单主
+export const wxVerifyEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/wxVerify`, data })
+}
+
 // 修改维修工单主
 export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
   return await request.put({ url: `/eam/equipment-repair-job-main/update`, data })
@@ -110,7 +115,7 @@ export const backEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) =
   return await request.post({ url: `/eam/equipment-repair-job-main/fallback`, data  })
 }
 
-//报修验证不通过,生成新工单
+//报修验证
 export const createEquipmentRepairNewOrder = async (data: EquipmentRepairJobMainVO) => {
   return await request.post({ url: `/eam/equipment-repair-job-main/createNew`, data  })
 }

src/api/eam/equipmentReportRepairRequest/index.ts

@@ -77,6 +77,11 @@ export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepa
   return await request.post({ url: `/eam/equipment-report-repair-request/updateOrder`, data  })
 }
 
+// 审核报修工单状态
+export const audiEquipmentReportRepairOrder = async (data: EquipmentReportRepairRequestVO) => {
+  return await request.post({ url: `/eam/equipment-report-repair-request/audiOrder`, data  })
+}
+
 // 完成并创建维修工单
 export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => {
   return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data  })

src/api/eam/equipmentSigning/index.ts

@@ -50,6 +50,10 @@ export const getEquipmentSigning = async (id: number) => {
 export const createEquipmentSigning = async (data: EquipmentSigningVO) => {
   return await request.post({ url: `/eam/equipment-signing/create`, data })
 }
+export const createsEquipmentSigning = async (data: EquipmentSigningVO) => {
+  return await request.post({ url: `/eam/equipment-signing/creates`, data })
+}
+
 
 // 修改设备到货签收记录
 export const updateEquipmentSigning = async (data: EquipmentSigningVO) => {

src/api/eam/equipmentSpotCheckMain/index.ts

@@ -66,9 +66,9 @@ export const updateEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainV
   return await request.put({ url: `/eam/equipment-spot-check-main/update`, data })
 }
 
-// 修改点检工单主
-export const updateEquipmentSpotCheck = async (data: EquipmentSpotCheckMainVO) => {
-  return await request.post({ url: `/eam/equipment-spot-check-main/updateOrders`, data })
+// 验证点检工单主
+export const verifyEquipmentSpotCheckMain = async (data: EquipmentSpotCheckMainVO) => {
+  return await request.post({ url: `/eam/equipment-spot-check-main/verifyOrder`, data })
 }
 
 // 删除点检工单主

src/api/eam/inspectionItem/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet";
 
 export interface InspectionItemVO {
   id: number

src/api/eam/inspectionItemSelectSet/index.ts

@@ -58,3 +58,13 @@ export const importTemplate = () => {
 export const updateEnableCode = async (data: InspectionItemSelectSetVO) => {
   return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data })
 }
+
+// 查询巡检项选择集列表
+export const getInspectionItemSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/inspection-item/getList`, params })
+}
+
+// 查询巡检方案项列表
+export const getRalInspectionOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-inspection-option-item/getList?optionCode=` + params})
+}

src/api/eam/maintenanceItemSelectSet/index.ts

@@ -56,5 +56,15 @@ export const importTemplate = () => {
 
 // 启用 / 禁用
 export const updateEnableCode = async (data: MaintenanceItemSelectSetVO) => {
-  return await request.post({ url: `/eam/basic/inspection-item-select-set/ables` , data })
+  return await request.post({ url: `/eam/basic/maintenance-item-select-set/ables` , data })
+}
+
+// 查询保养项选择集列表
+export const getMaintenanceItemSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/maintenance-item/getList`, params })
+}
+
+// 查询保养方案项列表
+export const getRalMaintenanceOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-maintenance-option-item/getList?optionCode=` + params})
 }

src/api/eam/recordDeviceChanged/index.ts

@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface RecordDeviceChangedVO {
+  id: number
+  code: string
+  name: string
+  statusBefore: string
+  statusAfter: string
+  operator: number
+  operateTime: Date
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询设备变更记录列表
+export const getRecordDeviceChangedPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/record-device-changed/senior', data })
+  } else {
+    return await request.get({ url: `/eam/record-device-changed/page`, params })
+  }
+}
+
+// 查询设备变更记录详情
+export const getRecordDeviceChanged = async (id: number) => {
+  return await request.get({ url: `/eam/record-device-changed/get?id=` + id })
+}
+
+// 新增设备变更记录
+export const createRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+  return await request.post({ url: `/eam/record-device-changed/create`, data })
+}
+
+// 修改设备变更记录
+export const updateRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+  return await request.put({ url: `/eam/record-device-changed/update`, data })
+}
+
+// 删除设备变更记录
+export const deleteRecordDeviceChanged = async (id: number) => {
+  return await request.delete({ url: `/eam/record-device-changed/delete?id=` + id })
+}
+
+// 导出设备变更记录 Excel
+export const exportRecordDeviceChanged = async (params) => {
+  return await request.download({ url: `/eam/record-device-changed/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/record-device-changed/get-import-template' })
+}

src/api/eam/repairExperience/index.ts

@@ -4,7 +4,7 @@ export interface RepairExperienceVO {
   id: number
   name: string
   content: string
-  repairNumber: string
+  repairRecordNumber: string
 }
 
 // 查询维修经验记录列表

src/api/eam/sparePartsApplyDetail/index.ts

@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface SparePartsApplyDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  currentQty: number
+  type: string
+  currentSinglePrice: number
+  equipmentCode: byte[]
+  jobNumber: byte[]
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件领用申请子列表
+export const getSparePartsApplyDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-apply-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-apply-detail/page`, params })
+  }
+}
+
+// 查询备件领用申请子详情
+export const getSparePartsApplyDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-apply-detail/get?id=` + id })
+}
+
+// 新增备件领用申请子
+export const createSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-apply-detail/create`, data })
+}
+
+// 修改备件领用申请子
+export const updateSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-apply-detail/update`, data })
+}
+
+// 删除备件领用申请子
+export const deleteSparePartsApplyDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-apply-detail/delete?id=` + id })
+}
+
+// 导出备件领用申请子 Excel
+export const exportSparePartsApplyDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-apply-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-apply-detail/get-import-template' })
+}

src/api/eam/sparePartsApplyMain/index.ts

@@ -0,0 +1,87 @@
+import request from '@/config/axios'
+
+export interface SparePartsApplyMainVO {
+  id: number
+  number: string
+  description: string
+  applyDeptId: string
+  sumVal: number
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件领用申请列表
+export const getSparePartsApplyMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-apply-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-apply-main/page`, params })
+  }
+}
+
+// 查询备件领用申请详情
+export const getSparePartsApplyMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/get?id=` + id })
+}
+
+// 新增备件领用申请
+export const createSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/create`, data })
+}
+
+// 修改备件领用申请
+export const updateSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-apply-main/update`, data })
+}
+
+// 删除备件领用申请
+export const deleteSparePartsApplyMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-apply-main/delete?id=` + id })
+}
+
+// 导出备件领用申请 Excel
+export const exportSparePartsApplyMain = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-apply-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-apply-main/get-import-template' })
+}
+
+// 撤回
+export const cancelSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/cancel?id=` + id })
+}
+// 审核
+export const submitSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/submitExamine?id=` + id })
+}
+// 审核驳回
+export const rejectSparePartsApplyMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-apply-main/reject?id=` + id })
+}
+// 审核通过
+export const approveSparePartsApplyMain = async (data) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/approve`, data })
+}
+
+// 完成
+export const finishSparePartsApplyMain = async (id) => {
+  return await request.post({ url: `/eam/spare-parts-apply-main/finish?id=` + id })
+}

src/api/eam/sparePartsInLocationDetail/index.ts

@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsInLocationDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsInLocationDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsInLocationDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsInLocationDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' })
+}

src/api/eam/sparePartsInLocationMain/index.ts

@@ -0,0 +1,91 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationMainVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsInLocationMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsInLocationMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsInLocationMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsInLocationMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data })
+  }else{
+    return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' })
+}
+
+// 撤回
+export const cancelSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/cancel?id=` + id  })
+}
+// 审核
+export const submitExamineSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/submitExamine?id=` + id  })
+}
+// 审核驳回
+export const rejectSparePartsInLocation = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main/reject?id=` + id  })
+}
+// 审核通过
+export const approveSparePartsInLocation = async (data) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/approve`,data })
+}
+// 完成
+export const finishSparePartsInLocation = async (id) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main/finish?id=` + id  })
+}

src/api/eam/sparePartsInLocationRecordDetail/index.ts

@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationDetailRecordVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsInLocationRecordDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsInLocationRecordDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsInLocationRecordDetail= async (data: SparePartsInLocationDetailRecordVO) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsInLocationRecordDetail = async (data: SparePartsInLocationDetailRecordVO) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsInLocationRecordDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsInLocationRecordDetail = async (params) => {
+  return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' })
+}

src/api/eam/sparePartsInLocationRecordMain/index.ts

@@ -0,0 +1,72 @@
+import request from '@/config/axios'
+
+export interface SparePartsInLocationMainRecordVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsInLocationRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsInLocationRecordMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsInLocationRecordMain = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsInLocationRecordMain = async (
+  data: SparePartsInLocationMainRecordVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsInLocationRecordMain= async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsInLocationRecordMain = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-in-location-main-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
+}

src/api/eam/sparePartsOutLocationDetail/index.ts

@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationDetailVO {
+  id: number
+  number: string
+  masterId: number
+  sparePartsCode: string
+  isRadeIn: string
+  applyQty: number
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录子列表
+export const getSparePartsOutLocationDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-detail/page`, params })
+  }
+}
+
+// 查询备件入库记录子详情
+export const getSparePartsOutLocationDetail = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-detail/get?id=` + id })
+}
+
+// 新增备件入库记录子
+export const createSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-detail/create`, data })
+}
+
+// 修改备件入库记录子
+export const updateSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-detail/update`, data })
+}
+
+// 删除备件入库记录子
+export const deleteSparePartsOutLocationDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-detail/delete?id=` + id })
+}
+
+// 导出备件入库记录子 Excel
+export const exportSparePartsOutLocationDetail = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-out-location-detail/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-detail/get-import-template' })
+}

src/api/eam/sparePartsOutLocationMain/index.ts

@@ -0,0 +1,81 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationMainVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsOutLocationMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-main/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsOutLocationMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-main/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-main/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsOutLocationMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-main/delete?id=` + id })
+}
+
+// 出库
+export const outSparePartsOutLocationMain = async (id) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main/out?id=` + id })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsOutLocationMain = async (params) => {
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({
+      url: `/eam/spare-parts-out-location-main/export-excel-senior`,
+      data
+    })
+  } else {
+    return await request.download({
+      url: `/eam/spare-parts-out-location-main/export-excel`,
+      params
+    })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-main/get-import-template' })
+}

src/api/eam/sparePartsOutLocationRecordDetail/index.ts

@@ -0,0 +1,76 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationRecordDetailVO {
+  id: number
+  number: string
+  theme: string
+  status: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询备件入库记录主列表
+export const getSparePartsOutLocationDetailRecordPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-detail-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-detail-record/page`, params })
+  }
+}
+
+// 查询备件入库记录主详情
+export const getSparePartsOutLocationDetailRecord = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-detail-record/get?id=` + id })
+}
+
+// 新增备件入库记录主
+export const createSparePartsOutLocationDetailRecord = async (
+  data: SparePartsOutLocationRecordDetailVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-detail-record/create`, data })
+}
+
+// 修改备件入库记录主
+export const updateSparePartsOutLocationDetailRecord = async (
+  data: SparePartsOutLocationRecordDetailVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-detail-record/update`, data })
+}
+
+// 删除备件入库记录主
+export const deleteSparePartsOutLocationDetailRecord = async (id: number) => {
+  return await request.delete({
+    url: `/eam/spare-parts-out-location-detail-record/delete?id=` + id
+  })
+}
+
+// 导出备件入库记录主 Excel
+export const exportSparePartsOutLocationDetailRecord = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-out-location-detail-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({
+    url: '/eam/spare-parts-out-location-detail-record/get-import-template'
+  })
+}

src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js

@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+// 创建领用出库记录子
+export function createSparePartsOutLocationRecordDetail(data) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新领用出库记录子
+export function updateSparePartsOutLocationRecordDetail(data) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除领用出库记录子
+export function deleteSparePartsOutLocationRecordDetail(id) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得领用出库记录子
+export function getSparePartsOutLocationRecordDetail(id) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得领用出库记录子分页
+export function getSparePartsOutLocationRecordDetailPage(query) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出领用出库记录子 Excel
+export function exportSparePartsOutLocationRecordDetailExcel(query) {
+  return request({
+    url: '/eam/spare-parts-out-location-detail-record/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/eam/sparePartsOutLocationRecordMain/index.ts

@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface SparePartsOutLocationRecordMainVO {
+  id: number
+  number: string
+  theme: string
+  applyer: string
+  approver: number
+  approveContent: string
+  approveTime: Date
+  autoExamine: string
+  autoAgree: string
+  directCreateRecord: string
+  areaCode: string
+  locationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询领用出库记录主列表
+export const getSparePartsOutLocationRecordMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data })
+  } else {
+    return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params })
+  }
+}
+
+// 查询领用出库记录主详情
+export const getSparePartsOutLocationRecordMain = async (id: number) => {
+  return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id })
+}
+
+// 新增领用出库记录主
+export const createSparePartsOutLocationRecordMain = async (
+  data: SparePartsOutLocationRecordMainVO
+) => {
+  return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data })
+}
+
+// 修改领用出库记录主
+export const updateSparePartsOutLocationRecordMain = async (
+  data: SparePartsOutLocationRecordMainVO
+) => {
+  return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data })
+}
+
+// 删除领用出库记录主
+export const deleteSparePartsOutLocationRecordMain = async (id: number) => {
+  return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id })
+}
+
+// 导出领用出库记录主 Excel
+export const exportSparePartsOutLocationRecordMain = async (params) => {
+  return await request.download({
+    url: `/eam/spare-parts-out-location-main-record/export-excel`,
+    params
+  })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' })
+}

src/api/eam/spotCheckSelectSet/index.ts

@@ -59,3 +59,14 @@ export const importTemplate = () => {
 export const updateEnableCode = async (data: BasicSpotCheckSelectSetVO) => {
   return await request.post({ url: `/eam/basic/spot-check-select-set/ables` , data })
 }
+
+
+// 查询点检项选择集列表
+export const getSpotCheckSelectSetList = async (params) => {
+  return  await request.get({ url: `/eam/basic/spot-check-item/getList`, params })
+}
+
+// 查询点检方案项列表
+export const getRalSpotCheckOptionItemList = async (params) => {
+  return  await request.get({url: `/eam/relation-spotCheck-option-item/getList?optionCode=` + params})
+}

src/api/qms/inspectionTemplate/index.ts

@@ -37,3 +37,8 @@ export const enableInspectionTemplate = async (id: number) => {
 export const disableInspectionTemplate = async (id: number) => {
   return await request.disable({ url: `/qms/programme-template/disable?id=` + id })
 }
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/qms/programme-template/get-import-template' })
+}

src/api/wms/areabasic/index.ts

@@ -66,3 +66,8 @@ export const exportArea = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/areabasic/get-import-template' })
 }
+
+// 根据code获取数据列表
+export const getAreabasicByCodes = async (params) => {
+  return await request.get({ url: `/wms/areabasic/listByCodes`, params })
+}

src/api/wms/balance/index.ts

@@ -41,6 +41,18 @@ export const getBalancePage = async (params) => {
     return await request.get({ url: `/wms/balance/page`, params })
   }
 }
+
+// 查询库存余额列表(包括已冻结，已失效的物料)
+export const getBalancePageAll = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorAll', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageAll`, params })
+  }
+}
+
 // 查询库存余额列表
 export const getBalancePageReturn= async (params) => {
   if (params.isSearch) {
@@ -178,3 +190,11 @@ export const getBalanceByBusinessTypeByItemType = async (params) => {
     return await request.get({ url: `/wms/balance/pageBusinessTypeToBalance`, params })
   }
 }
+// 根据code获取数据列表
+export const getBalanceItemListByCodes = async (data) => {
+    return await request.get({ url: `/wms/balance/listByCodes`,data })
+}
+// 查询bom批次默认数据
+export const getBanchBomPage = async (params) => {
+  return await request.get({ url: `/wms/balance/pageBOM`, params })
+}

src/api/wms/business/business.ts

@@ -0,0 +1,524 @@
+// 获取供应商列表
+import { getSupplierListByCodes, importTemplate } from '@/api/wms/supplier'
+// 获取物料列表
+import { getItemListByCodes } from '@/api/wms/itembasic'
+// 获取供应商物料列表
+import { getSupplierItemListByCodes } from '@/api/wms/supplieritem'
+// 获取生产线物料
+import { getProductionLineCodelistByCodes } from '@/api/wms/productionlineitem'
+// 获取包装规格
+import { getPackageunitListByCodes } from '@/api/wms/packageunit'
+// 获取物料包装规格
+import { getItemPackageunitListByCodes } from '@/api/wms/itempackage'
+// 获取客户物料
+import { getCustomerItemListByCodes } from '@/api/wms/customeritem'
+// 获取库存余额
+import { getBalanceItemListByCodes } from '@/api/wms/balance'
+import { isString } from 'min-dash'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+/**
+ * 业务组件
+ * tableFormBlur  表格表单失去焦点时候获取焦点
+ * FormBlur  表格失去焦点时候获取焦点
+ */
+export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => {
+  if (
+    headerItem.field == 'fromPackingNumber' ||
+    headerItem.field == 'packingNumber' ||
+    headerItem.field == 'itemCode' ||
+    headerItem.field == 'packUnit' ||
+    headerItem.field == 'secondPackUnit' ||
+    headerItem.field == 'fromPackUnit' ||
+    headerItem.field == 'toPackUnit'||
+    headerItem.field == 'toPackUnit'||
+    headerItem.field == 'supplierItemCode'
+    
+  ) {
+    let searchField = headerItem.field
+    let pageApi = ref()
+    let params = ref()
+
+    if (val && isString(val)) {
+      // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field)
+      if (val.indexOf(',') > -1) {
+        message.alert('该输入框只能输入一条数据')
+        row[headerItem.field] = ''
+        return
+      }
+      // 校验
+      let params = ref({})
+      let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+      // 循环参数设置参数为key：value格式
+      if (searchCondition1 && searchCondition1.length > 0) {
+        for (let i = 0; i < searchCondition1.length; i++) {
+          if (searchCondition1[i].isMainValue) {
+            params.value[searchCondition1[i].key] = formRef.formModel[
+              searchCondition1[i].value
+            ]
+              ? formRef.formModel[searchCondition1[i].value]
+              : detailData
+              ? detailData[searchCondition1[i].value]
+              : row
+              ? row[searchCondition1[i].value]
+              : ''
+            // 是否含有空参数情况
+            let isNull = false
+            if (
+              params.value[searchCondition1[i].key] == '' ||
+              params.value[searchCondition1[i].key] == undefined
+            ) {
+              isNull = true
+            }
+            if (isNull) {
+              message.warning(
+                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+              )
+              row[headerItem.field] = ''
+              return
+            }
+          } else {
+            // 扩展 转换为筛选条件进行查询
+            if (searchCondition1[i].isSearch) {
+              if (searchCondition1[i].isFormModel) {
+                //用formModel中的值
+                if (searchCondition1[i].required) {
+                  if (
+                    formRef.formModel[searchCondition1[i].value] == '' ||
+                    formRef.formModel[searchCondition1[i].value] == undefined
+                  ) {
+                    message.warning(
+                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                    )
+                    row[headerItem.field] = ''
+                    return
+                  }
+                }
+              }
+            } else {
+              params.value[searchCondition1[i].key] = searchCondition1[i].value
+            }
+          }
+        }
+      }
+      params.value[headerItem.field] = val?.trim()
+      // 判断改包装号是否已经添加
+      const seen = new Set()
+      const repeatCode = new Set()
+      let arr = tableData.map((item) => item[headerItem.field]?.trim())
+      arr.forEach((item) => {
+        if (seen.has(item)) {
+          repeatCode.add(item)
+        } else {
+          seen.add(item)
+        }
+      })
+      const arr1 = Array.from(repeatCode)
+      if (arr1.length > 0) {
+        message.warning(`${arr1.join(',')}${t('ts.已经存在')}`)
+        row[headerItem.field] = ''
+        return
+      }
+      if (
+        headerItem.field == 'fromPackingNumber' ||
+        headerItem.field == 'packingNumber' ||
+        headerItem.field == 'itemCode'
+      ) {
+        // 业务
+        // 采购退货申请，制品拆解,调拨出库,报废出库申请，合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请，库存修改申请
+        if (
+          routeName == 'PurchasereturnRequestMain' ||
+          routeName == 'ProductdismantleRequestMain' ||
+          routeName == 'TransferissueRequestMain' ||
+          routeName == 'ScrapRequestMain' ||
+          routeName == 'OktoholdRequestMain' ||
+          routeName == 'HoldtookRequestMain' ||
+          routeName == 'HoldtoscrapRequestMain' ||
+          routeName == 'OktoscrapRequestMain' ||
+          routeName == 'ScraptoholdRequestMain' ||
+          routeName == 'InventorymoveRequestMain' ||
+          routeName == 'InventorychangeRequestMain'
+        ) {
+          // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同
+          // if (
+          //   routeName == 'OktoholdRequestMain' ||
+          //   routeName == 'HoldtookRequestMain' ||
+          //   routeName == 'HoldtoscrapRequestMain' ||
+          //   routeName == 'OktoscrapRequestMain' ||
+          //   routeName == 'ScraptoholdRequestMain' ||
+          //   routeName == 'InventorymoveRequestMain' ||
+          //   routeName == 'InventorychangeRequestMain'
+          // ) {
+          //   searchField = 'packingNumber'
+          //   params.value.packingNumber = val?.trim()
+          // }
+          // pageApi.value = getBalanceItemListByCodes
+        } else if (
+          routeName == 'RepleinshRequestMain' ||
+          routeName == 'IssueRequestMain' ||
+          routeName == 'InventoryinitRequestMain'
+        ) {
+          // 补料申请业务
+          pageApi.value = getItemListByCodes
+          searchField = 'code'
+          params.value.codes = val?.trim()
+        } else if (
+          routeName == 'ProductionMainAssemble' ||
+          routeName == 'ProductionMainASparePart' ||
+          routeName == 'ProductionMainPredictSparePart' ||
+          routeName == 'ProductreceiptRequestMain' ||
+          routeName == 'ProductreceiptRequestMainA' ||
+          routeName == 'ProductreceiptscrapRequestMain' ||
+          routeName == 'ProductscrapRequestMain'
+        ) {
+          // 装配计划,裝配备件计划,预备产件计划，预生产收货申请,装配收货申请,报修收货申请,制品报废申请
+          pageApi.value = getProductionLineCodelistByCodes
+          params.value.productionLineCode=
+              formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode,
+              params.value.itemCodes=val?.trim()
+        }
+      } else if (
+        headerItem.field == 'packUnit' ||
+        headerItem.field == 'secondPackUnit' ||
+        headerItem.field == 'fromPackUnit' ||
+        headerItem.field == 'toPackUnit'
+      ) {
+        searchField = 'packUnit'
+        //包装规格
+        // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请，计划外入库，计划外出库,翻包申请
+        if (
+          routeName == 'ProductreceiptRequestMain' ||
+          routeName == 'ProductreceiptRequestMainA' ||
+          routeName == 'ProductreceiptscrapRequestMain' ||
+          routeName == 'CustomerreturnRequestMain' ||
+          routeName == 'UnplannedreceiptRequestMain' ||
+          routeName == 'UnplannedissueJobMain' ||
+          routeName == 'PackageoverRequestMain'
+        ) {
+          params.value.itemCode= row.itemCode
+          params.value.packUnit= val?.trim()
+          pageApi.value = getItemPackageunitListByCodes
+        }
+      } else if (
+        headerItem.field == 'supplierItemCode' 
+      ) {
+        // 生产退料申请,隔离退料申请
+        if (
+          routeName == 'ProductionreturnRequestMain' ||
+          routeName == 'ProductionreturnRequestMainNo' 
+        ) {
+        searchField = 'supplierCode'
+          params.value.itemCodes= row.itemCode
+          params.value.supplierCode= val?.trim()
+          pageApi.value = getSupplierItemListByCodes
+        }
+      }
+      const list = ref()
+      // 调取包装接口
+     await pageApi.value(params.value).then(async (res) => {
+        list.value = res ? res : []
+        // 只查一条数据，多条数据查询默认显示不存在
+        if (res.length == 1) {
+          callback(searchField,list.value)
+        } else {
+          message.alert('代码' + row[headerItem.field] + '没有找到对应数据')
+          row[headerItem.field] = ''
+          return
+        }
+      })
+    }
+  }
+}
+export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => {
+  let pageApi = ref()
+  let params = ref()
+  let setV = {}
+  setV[formField] = ''
+  if (val && isString(val)) {
+    if (
+      formField == 'supplierCode' ||
+      formField == 'itemCode' ||
+      formField == 'productItemCode' ||
+      formField == 'componentItemCode' ||
+      formField == 'packUnit' ||
+      formField == 'inPackUnit' ||
+      formField == 'fromPackingNumber'
+    ) {
+      let searchField = 'code'
+      if (formField == 'supplierCode') {
+        params.value = val?.trim()
+        pageApi.value = getSupplierListByCodes
+      } else if (
+        formField == 'itemCode' ||
+        formField == 'productItemCode' ||
+        formField == 'componentItemCode'
+      ) {
+        // 销售价格单
+        if (routeName == 'Saleprice') {
+          params.value = {
+            customerCode: formRef.formModel.customerCode,
+            itemCodes: val?.trim()
+          }
+          pageApi.value = getCustomerItemListByCodes
+          searchField = 'itemCode'
+        }else  if (routeName == 'ProductscrapRequestMain') {
+          // 制品报废申请
+          params.value = {
+            productionLineCode:
+              detailData.productionLine || detailData.productionLineCode,
+            itemCodes: val?.trim()
+          }
+          pageApi.value = getProductionLineCodelistByCodes
+          searchField = 'itemCode'
+        }else {
+          // params.value = val.trim()
+          searchField = 'code'
+          
+          params.value={
+            codes:val?.trim()
+          }
+          pageApi.value = getItemListByCodes
+        }
+      } else if (formField == 'packUnit') {
+        if(routeName == 'Itemwarehouse'||routeName == 'Callmaterials'){//物料仓库默认配置,叫料标签
+          searchField = 'packUnit'
+          params.value = {
+            itemCode: formRef.formModel.itemCode,
+            packUnit: val?.trim()
+          }
+          pageApi.value = getItemPackageunitListByCodes
+        }else{
+         params.value = val?.trim()
+         pageApi.value = getPackageunitListByCodes
+        }
+      } else if (formField == 'inPackUnit') {
+        params.value = {
+          itemCode: formRef.formModel.itemCode,
+          packUnit: val.trim()
+        }
+        pageApi.value = getItemPackageunitListByCodes
+      } 
+      // else if (formField == 'fromPackingNumber') {
+      //   params.value = {
+      //     packingNumber: val?.trim()
+      //   }
+      //   pageApi.value = getBalanceItemListByCodes
+      // }
+      let obj = {}
+      let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps
+        .searchCondition //获取data.ts参数信息
+      // 循环参数设置参数为key：value格式
+      if (searchCondition1 && searchCondition1.length > 0) {
+        for (let i = 0; i < searchCondition1.length; i++) {
+          if (searchCondition1[i].isMainValue) {
+            obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value]
+              ? formRef.formModel[searchCondition1[i].value]
+              : detailData
+              ? detailData[searchCondition1[i].value]
+              : ''
+            // 是否含有空参数情况
+            let isNull = false
+            if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) {
+              isNull = true
+            }
+            if (isNull) {
+              message.warning(
+                searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+              )
+              return
+            }
+          } else {
+            // 扩展 转换为筛选条件进行查询
+            if (searchCondition1[i].isSearch) {
+              if (searchCondition1[i].isFormModel) {
+                //用formModel中的值
+                if (searchCondition1[i].required) {
+                  if (
+                    formRef.formModel[searchCondition1[i].value] == '' ||
+                    formRef.formModel[searchCondition1[i].value] == undefined
+                  ) {
+                    message.warning(
+                      searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                    )
+                    return
+                  }
+                }
+              }
+            } else {
+              obj[searchCondition1[i].key] = searchCondition1[i].value
+            }
+          }
+        }
+      }
+
+      let obj1 = formSchema.find((item) => item.field == formField)
+      if (!obj1.componentProps.multiple && val.indexOf(',') > -1) {
+        message.alert('该输入框只能输入一条数据')
+        formRef.setValues(setV)
+        return
+      }
+     await pageApi.value(params.value).then((res) => {
+        let arr1 = val.split(',')
+        let list = ref([])
+        list.value = res
+        if (list.value?.length == 0) {
+          message.alert('暂无数据')
+          formRef.setValues(setV)
+          return
+        }
+        if (arr1.length != list.value.length) {
+          let arr2 = list.value.map((item) => item.code)
+          let str = [
+            ...arr1.filter((item) => !arr2.includes(item)),
+            ...arr2.filter((item) => !arr1.includes(item))
+          ].join(',')
+          message.alert('代码' + str + '没有找到对应数据')
+          formRef.setValues(setV)
+          return
+        }
+        // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form')
+        callback(searchField,list.value)
+      })
+    }
+  }
+}
+
+// 根据下方输入框失去焦点校验信息
+export const getListByBottonInput = async (headerItem, val,row,routeName,formRef,detailData,tableData,callback) => {
+  let pageApi = ref()
+  let params = ref({})
+  let list = ref([])
+  let field = 'itemCode'
+  // scp采购订单
+  if(!val)return;
+  if (routeName == 'PurchaseMain') {
+    pageApi.value = getSupplierItemListByCodes
+    params.value = {
+      supplierCode: formRef.formModel.supplierCode,
+      itemCodes: val?.trim(),
+      available: true
+    }
+  } else if (routeName == 'ProductionMain') {
+    pageApi.value = getProductionLineCodelistByCodes
+    params.value = {
+      productionLineCode: formRef.formModel.productionLine,
+      itemCodes: val?.trim()
+    }
+  } else if (
+    routeName == 'ZZBJDeliverPlanMain' ||
+    routeName == 'DeliverPlanMain' ||
+    routeName == 'DeliverRequestMain' ||
+    routeName == 'ZZBJDeliverRequestMain'
+  ) {
+    // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请
+    pageApi.value = getCustomerItemListByCodes
+    params.value = {
+      customerCode: formRef.formModel.customerCode,
+      itemCodes: val?.trim()
+    }
+  } 
+  // else if (routeName == 'UnplannedissueRequestMain') {
+  //   // 计划外出库
+  //   pageApi.value = getBalanceItemListByCodes
+  //   params.value = {
+  //     packingNumber: val?.trim()
+  //   }
+  //   field = 'packingNumber'
+  // } 
+  else {
+    params.value.codes = val?.trim()
+    pageApi.value = getItemListByCodes
+  }
+  let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息
+  // 循环参数设置参数为key：value格式
+  if (searchCondition1 && searchCondition1.length > 0) {
+    for (let i = 0; i < searchCondition1.length; i++) {
+      if (searchCondition1[i].isMainValue) {
+        params.value[searchCondition1[i].key] = formRef.formModel[
+          searchCondition1[i].value
+        ]
+          ? formRef.formModel[searchCondition1[i].value]
+          : detailData
+          ? detailData[searchCondition1[i].value]
+          : ''
+        // 是否含有空参数情况
+        let isNull = false
+        if (
+          params.value[searchCondition1[i].key] == '' ||
+          params.value[searchCondition1[i].key] == undefined
+        ) {
+          isNull = true
+        }
+        if (isNull) {
+          message.warning(
+            searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+          )
+          return
+        }
+      } else if (searchCondition1[i].isTableRowValue) {
+        if (searchCondition1[i].required) {
+          if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) {
+            message.warning(
+              searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+            )
+            return
+          }
+        }
+        row[searchCondition1[i].value]
+        //查询当前table表数据的值
+        params.value[searchCondition1[i].key] = row[searchCondition1[i].value]
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition1[i].isSearch) {
+          if (searchCondition1[i].isFormModel) {
+            //用formModel中的值
+            if (searchCondition1[i].required) {
+              if (
+                formRef.formModel[searchCondition1[i].value] == '' ||
+                formRef.formModel[searchCondition1[i].value] == undefined
+              ) {
+                message.warning(
+                  searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！'
+                )
+                return
+              }
+            }
+          }else {
+            params.value[searchCondition1[i].key] = searchCondition1[i].value
+          }
+        } else {
+          params.value[searchCondition1[i].key] = searchCondition1[i].value
+        }
+      }
+    }
+  }
+  await pageApi.value(params.value).then(async (res) => {
+    list.value = res ? res : []
+    let arr1 = val.split(',').map(item=>item.trim())
+    if (arr1.length != res.length) {
+      let arr2 = res.map((item) => item[field])
+      let str = [
+        ...arr1.filter((item) => !arr2.includes(item)),
+        ...arr2.filter((item) => !arr1.includes(item))
+      ].join(',')
+      message.alert('代码' + str + '没有找到对应数据')
+      return
+    } else {
+      let repeatCode = []
+      if(tableData.length > 0){
+        tableData.forEach((item) => {
+          const findIndex = arr1.findIndex(valItem=>valItem==item[field]) 
+          if(findIndex > -1){
+            arr1.splice(findIndex,1)
+            repeatCode.push(item.itemCode)
+          }
+        })
+      }
+      if(repeatCode.length>0){
+        message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+        return;
+      }
+      callback(list.value)
+    }
+  })
+}

src/api/wms/countPlanMain/index.ts

@@ -8,6 +8,7 @@ export interface CountPlanMainVO {
   ignoreListOfItem: string
   ignoreListOfLocation: string
   scopeList: string
+  countSplitType: string
   number: string
   businessType: string
   remark: string

src/api/wms/customeritem/index.ts

@@ -73,3 +73,8 @@ export const getPageBusinessTypeToItemCode = async (params) => {
     return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params })
   }
 }
+
+// 根据code获取数据列表
+export const getCustomerItemListByCodes = async (data) => {
+  return await request.get({ url: `/wms/customeritem/listByCodes?itemCodes=` + data.itemCodes +  '&customerCode='+data.customerCode +  '&businessType='+(data.businessType?data.businessType:'') })
+}

src/api/wms/demandforecastingDetail/index.ts

@@ -1,4 +1,6 @@
 import request from '@/config/axios'
+import { isString } from '@/utils/is'
+import dayjs from 'dayjs'
 
 export interface DemandforecastingDetailVO {
   predictTimeType: string
@@ -15,6 +17,57 @@ export interface DemandforecastingDetailVO {
   available: string
 }
 
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+  // 到货日期
+  if(params.dueDate&&params.dueDate.length>0){
+    if(isString(params.dueDate[0])){
+      params.startDate = params.dueDate[0]
+    }else{
+      params.startDate = params.dueDate[0].format('YYYY-MM-DD')
+    }
+
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    if(isString(params.dueDate[1])){
+      params.endDate = params.dueDate[1]
+    }else{
+      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+    }
+  }
+  params.dueDate = ''
+
+  //计划员
+  if(params.planerId&&params.planerId.length>0){
+    params.planers = params.planerId.join(',')
+  }
+  params.planerId = ''
+  // 供应商代码
+  if(params.supplierCode&&params.supplierCode.length>0){
+    let keyValue = params.supplierCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.supplierCodes = keyValue.join(',')
+  }
+  params.supplierCode = ''
+
+  // 物料代码
+  if(params.itemCode&&params.itemCode.length>0){
+    let keyValue = params.itemCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.itemCodes = keyValue.join(',')
+  }
+  params.itemCode = ''
+
+  // 版本号
+  if(params.version&&params.version.length>0){
+    let keyValue = params.version.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.versions = keyValue.join(',')
+  }
+  params.version = ''
+  return params
+}
+
 // 查询要货预测子列表
 export const getDemandforecastingDetailPage = async (params) => {
   if (params.isSearch) {
@@ -22,6 +75,8 @@ export const getDemandforecastingDetailPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
+    params = getPageParams(params)
+    console.log('params',params)
     return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
   }
 }
@@ -50,3 +105,16 @@ export const deleteDemandforecastingDetail = async (id: number) => {
 export const exportDemandforecastingDetail = async (params) => {
   return await request.download({ url: `/wms/demandforecasting-detail/export-excel`, params })
 }
+
+// 查询要货预测主列表
+export const getPageTableHead = async (params) => {
+  params = getPageParams(params)
+  console.log('params',params)
+  return await request.get({ url: `/wms/demandforecasting-detail/queryPageTableHead`, params })
+}
+
+
+// 查询版本号
+export const queryVersion = async (params) => {
+  return await request.get({ url: `/wms/demandforecasting-detail/queryVersion`, params })
+}

src/api/wms/demandforecastingMain/index.ts

@@ -81,3 +81,23 @@ export const exportDemandforecastingMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
 }
+
+
+// 计划员
+export const queryUserPlanerList = async () => {
+  return await request.post({ url: `/wms/demandforecasting-main/queryUserPlanerList`,data:{} })
+
+}
+
+// 供应商代码
+export const querySupplierList = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
+}
+
+
+// 是否已读接口
+export const updateIsRead = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
+}
+
+

src/api/wms/itembasic/index.ts

@@ -114,3 +114,8 @@ export const selectConfigToItembasic = async (params) => {
 export const getQueryItemCodeInfo = async (data) => {
   return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
 }
+// 根据code获取数据列表
+export const getItemListByCodes = async (params) => {
+  return await request.get({ url: `/wms/itembasic/listByCodes`,params})
+}
+

src/api/wms/itempackage/index.ts

@@ -29,7 +29,26 @@ export const getItempackagingPage = async (params) => {
     return await request.get({ url: `/wms/itempackage/page`, params })
   }
 }
-
+// 查询物料包装信息树形列表
+export const getItempackagingPageTree = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/seniorTree', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageTree`, params })
+  }
+}
+// 查询物料包装信息树形列表
+export const getItempackagingPageTreeSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/seniorTreeSCP', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageTreeSCP`, params })
+  }
+}
 // 查询物料包装信息 列表--供应商发货申请
 export const getItempackagingPageBySupplierdeliver = async (params) => {
   if (params.isSearch) {
@@ -86,3 +105,7 @@ export const exportItempackaging = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/itempackage/get-import-template' })
 }
+// 根据code获取数据列表
+export const getItemPackageunitListByCodes = async (data) => {
+  return await request.get({ url: `/wms/itempackage/listByCodes?itemCode=` + data.itemCode +  '&packUnit='+data.packUnit})
+}

src/api/wms/mstr/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface MstrVO {
+  id: number
+  hflccHflcd: string
+  plProdLine: string
+  plDesc: string
+  plMvarAcct: string
+  plCchgAcct: string
+  type: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询产品类信息列表
+export const getMstrPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/mstr/senior', data })
+  } else {
+    return await request.get({ url: `/wms/mstr/page`, params })
+  }
+}
+
+// 查询产品类信息详情
+export const getMstr = async (id: number) => {
+  return await request.get({ url: `/wms/mstr/get?id=` + id })
+}
+
+// 新增产品类信息
+export const createMstr = async (data: MstrVO) => {
+  return await request.post({ url: `/wms/mstr/create`, data })
+}
+
+// 修改产品类信息
+export const updateMstr = async (data: MstrVO) => {
+  return await request.put({ url: `/wms/mstr/update`, data })
+}
+
+// 删除产品类信息
+export const deleteMstr = async (id: number) => {
+  return await request.delete({ url: `/wms/mstr/delete?id=` + id })
+}
+
+// 导出产品类信息 Excel
+export const exportMstr = async (params) => {
+  return await request.download({ url: `/wms/mstr/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/mstr/get-import-template' })
+}

src/api/wms/packageoverJobMain/index.ts

@@ -69,6 +69,10 @@ export const updatePackageoverJobMain = async (data: PackageoverJobMainVO) => {
 export const deletePackageoverJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/packageover-job-main/delete?id=` + id })
 }
+// 关闭翻包任务主
+export const closePackageoverJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/packageover-job-main/close?id=` + id })
+}
 
 // 导出翻包任务主 Excel
 export const exportPackageoverJobMain = async (params) => {

src/api/wms/packageunit/index.ts

@@ -33,7 +33,26 @@ export const getPackageunitPage = async (params) => {
     return await request.get({ url: `/wms/packageunit/page`, params })
   }
 }
-
+// 查询物品包装规格信息 列表树状图
+export const getPackageunitPageTree = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/seniorTree', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/pageTree`, params })
+  }
+}
+// 查询物品父级包装规格信息
+export const getPackageunitPageParent = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/seniorParent', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/pageParent`, params })
+  }
+}
 // 查询物品包装规格信息 详情
 export const getPackageunit = async (id: number) => {
   return await request.get({ url: `/wms/packageunit/get?id=` + id })
@@ -69,3 +88,8 @@ export const exportPackageunit = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/packageunit/get-import-template' })
 }
+
+// 根据code获取数据列表
+export const getPackageunitListByCodes = async (codes: string) => {
+  return await request.get({ url: `/wms/packageunit/listByCodes?codes=` + codes })
+}

src/api/wms/pickJobMain/index.ts

@@ -75,7 +75,7 @@ export const exportPickJobMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/pick-job-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/pick-job-main/export-excel`, params })
   }

src/api/wms/pickRecordMain/index.ts

@@ -62,7 +62,7 @@ export const exportPickRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/pick-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/pick-record-main/export-excel`, params })
   }

src/api/wms/plansetting/index.ts

@@ -51,7 +51,7 @@ export const exportPlansetting = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/plansetting/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/plansetting/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/plansetting/export-excel`, params })
   }

src/api/wms/preparetoissueMain/index.ts

@@ -107,3 +107,9 @@ export const publish = (id) => {
 export const resetting = (id) => {
   return request.put({ url: '/wms/preparetoissue-main/resetting?id=' + id })
 }
+
+
+// 创建发料申请
+export const generateIssueRequest = (number) => {
+  return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number })
+}

src/api/wms/process/index.ts

@@ -63,3 +63,8 @@ export const importTemplate = () => {
 export const getProcessNoPage = async (params) => {
   return await request.get({ url: `/wms/process/noPage`, params })
 }
+
+// 根据code获取数据列表
+export const getProcessByCodes = async (params) => {
+  return await request.get({ url: `/wms/process/listByCodes`, params })
+}

src/api/wms/productionMain/index.ts

@@ -179,11 +179,20 @@ export const resetting = (id) => {
   return request.put({ url: '/wms/production-main/resetting?id=' + id })
 }
 
-// 创建备料计划/制品收货申请
-export const generateRequest = (number) => {
-  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+// 创建备料计划
+export const generatePreparetoissue = (number) => {
+  return request.post({ url: '/wms/production-main/generatePreparetoissue?number=' + number })
 }
 
+// 创建制品收货申请
+export const generateProductreceiptRequest = (number) => {
+  return request.post({ url: '/wms/production-main/generateProductreceiptRequest?number=' + number })
+}
+
+// 创建发料申请
+export const generateIssueRequest = (number) => {
+  return request.post({ url: '/wms/preparetoissue-main/generateIssueRequest?number=' + number })
+}
 
 
 

src/api/wms/productionlineitem/index.ts

@@ -67,3 +67,8 @@ export const exportProductionlineitem = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionlineitem/get-import-template' })
 }
+
+
+export const getProductionLineCodelistByCodes = (data) => {
+  return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes})
+}

src/api/wms/purchasePlanDetail/index.ts

@@ -15,7 +15,17 @@ export interface PurchasePlanDetailVO {
   updater: string
   available: string
 }
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
 
+  console.log('params.status',params.status)
+  // 状态
+  if(params.status&&params.status.length>0){
+    params.statuss = params.status.join(',')
+  }
+  params.status = ''
+  return params
+}
 // 查询要货计划子列表
 export const getPurchasePlanDetailPage = async (params) => {
   if (params.isSearch) {
@@ -23,6 +33,7 @@ export const getPurchasePlanDetailPage = async (params) => {
     const data = {...params}
     return await request.post({ url: '/wms/purchase-plan-detail/senior', data })
   } else {
+    params = getPageParams(params)
     return await request.get({ url: `/wms/purchase-plan-detail/page`, params })
   }
 }

src/api/wms/purchasePlanMain/index.ts

@@ -85,7 +85,24 @@ export const exportPurchasePlanMain = async (params) => {
     return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
   }
 }
-
+// 导出明细要货计划主 Excel
+export const exportDetailsPurchasePlanMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchase-plan-main/export-excel-detail`, params })
+  }
+}
+// 导出要货计划二维表 Excel
+export const exportTablePurchasePlanMain = async (params) => {
+  // if (params.isSearch) {
+  //   const data = {...params}
+  //   return await request.downloadPost({ url: `/wms/purchase-plan-main/export-excel-senior`, data })
+  // } else {
+    return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })
+  //}
+}
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchase-plan-main/get-import-template' })

src/api/wms/purchasereceiptJobMain/index.ts

@@ -136,6 +136,6 @@ export const acceptPurchasereceiptJobMain = (id: number) => {
 }
 
 // 拒收采购收货任务主
-export const refusalPurchasereceiptJobMain = (id: number) => {
-  return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id })
+export const refusalPurchasereceiptJobMain = (data) => {
+  return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data})
 }

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -61,6 +61,19 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
   }
 }
 
+
+// 查询采购拒收记录
+export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorRefuse', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageRefuse`, params })
+  }
+}
+
+
 // 查询备件收货记录子列表
 export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
   if (params.isSearch) {

src/api/wms/purchasereceiptRecordMain/index.ts

@@ -89,6 +89,17 @@ export const exportPurchasereceiptRecordMain = async (params) => {
   }
 }
 
+// 导出采购收货记录主 Excel
+export const exportPurchasereceiptRecordRefuseMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior-refuse`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-refuse`, params })
+  }
+}
+
+
 // 导出备件收货记录
 export const exportSparereceiptRecordMain = async (params) => {
   if (params.isSearch) {

src/api/wms/purchasereceiptRequestDetail/index.ts

@@ -57,6 +57,18 @@ export const getPurchasereceiptRequestDetailPageSpare = async (params) => {
   }
 }
 
+
+// 查询M类型收货申请子列表
+export const getPurchasereceiptRequestDetailPageOrderMType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-detail/seniorOrderMType', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-detail/pageOrderMType`, params })
+  }
+}
+
 // 查询采购收货申请子详情
 export const getPurchasereceiptRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-request-detail/get?id=` + id })

src/api/wms/scrapJobMain/index.ts

@@ -85,7 +85,7 @@ export const exportScrapJobMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/scrap-job-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
   }

src/api/wms/stockupMainJob/index.ts

@@ -84,7 +84,7 @@ export const exportStockupMainJob = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/stockup-main-job/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/stockup-main-job/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/stockup-main-job/export-excel`, params })
   }

src/api/wms/strategy/index.ts

@@ -46,7 +46,7 @@ export const exportStrategy = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/strategy/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/strategy/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/strategy/export-excel`, params })
   }

src/api/wms/supplier/index.ts

@@ -93,3 +93,9 @@ export const exportSupplierSCP = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplier/get-import-template' })
 }
+
+// 根据code获取数据列表
+export const getSupplierListByCodes = async (codes: string) => {
+  return await request.get({ url: `/wms/supplier/listByCodes?codes=` + codes })
+}
+

src/api/wms/supplierCycle/index.ts

@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SupplierCycleVO {
+  id: number
+  supplierCode: string
+  monday: string
+  tuesday: string
+  wednesday: string
+  thursday: string
+  friday: string
+  saturday: string
+  sunday: string
+  version: string
+  remark: string
+  extraProperties: string
+  siteId: string
+  beginTime: Date
+  endTime: Date
+  available: string
+  status: string
+  concurrencyStamp: string
+  ruleUserId: number
+  departmentCode: string
+}
+
+// 查询要货预测周期列表
+export const getSupplierCyclePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplier-cycle/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplier-cycle/page`, params })
+  }
+}
+
+// 查询要货预测周期详情
+export const getSupplierCycle = async (id: number) => {
+  return await request.get({ url: `/wms/supplier-cycle/get?id=` + id })
+}
+
+// 新增要货预测周期
+export const createSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.post({ url: `/wms/supplier-cycle/create`, data })
+}
+
+// 修改要货预测周期
+export const updateSupplierCycle = async (data: SupplierCycleVO) => {
+  return await request.put({ url: `/wms/supplier-cycle/update`, data })
+}
+
+// 删除要货预测周期
+export const deleteSupplierCycle = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier-cycle/delete?id=` + id })
+}
+
+// 导出要货预测周期 Excel
+export const exportSupplierCycle = async (params) => {
+  return await request.download({ url: `/wms/supplier-cycle/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier-cycle/get-import-template' })
+}

src/api/wms/supplierdeliverRequestDetail/index.ts

@@ -43,7 +43,14 @@ export const getSupplierdeliverRequestDetailPage = async (params) => {
     return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params })
   }
 }
-
+// 查询供应商发货申请子列表
+export const getGenerateLabelList = async (params) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelList`, params })
+}
+// 查询托规格列表
+export const getGenerateLabelParentList = async (params) => {
+  return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelParentList`, params })
+}
 // 查询供应商发货申请子详情
 export const getSupplierdeliverRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/supplierdeliver-request-detail/get?id=` + id })

src/api/wms/supplierinvoiceRequestDetail/index.ts

@@ -41,7 +41,13 @@ export const getPoNumber = async (params) => {
 
 // 查询供应商发票明细数据
 export const getPoNumberPoLineInfo = async (params) => {
-  return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params})
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: `/wms/supplierinvoice-request-detail/getPoNumbersenior`, data})
+  }else{
+    return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params})
+  }
 }
 
 

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -75,8 +75,8 @@ export const subSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
 }
 // 采购--审批通过供应商发货申请主
-export const appSupplierinvoiceRequestMain = async (id: number) => {
-  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
+export const appSupplierinvoiceRequestMain = async (id: number,balanceStatement:any) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id+ (balanceStatement?'&balanceStatement=' + balanceStatement:'')})
 }
 // 采购--驳回供应商发货申请主
 export const rejSupplierinvoiceRequestMain = async (data) => {
@@ -89,8 +89,8 @@ export const invoiceSentOutSupplierinvoiceRequestMain = async (id: number) => {
 }
 
 // 财务--审批通过供应商发货申请主
-export const financeappSupplierinvoiceRequestMain = async (id: number) => {
-  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp?id=` + id })
+export const financeappSupplierinvoiceRequestMain = async (data) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/financeApp`, data })
 }
 // 财务--驳回供应商发货申请主
 export const financerejSupplierinvoiceRequestMain = async (data) => {
@@ -147,3 +147,8 @@ export const getLoginUserRoleList = async () => {
   
 }
 
+// 编辑的时候计算主表系统税额
+export const getTaxAmount = async ({id,taxRate}) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/computeById?id=${id}&taxRate=${taxRate}`})
+  
+}

src/api/wms/supplieritem/index.ts

@@ -51,16 +51,27 @@ export const getSupplieritem = async (id: number) => {
 export const createSupplieritem = async (data: SupplieritemVO) => {
   return await request.post({ url: `/wms/supplieritem/create`, data })
 }
+export const createSupplieritemSCP = async (data: SupplieritemVO) => {
+  return await request.post({ url: `/wms/supplieritem/createSCP`, data })
+}
 
 // 修改供应商物料
 export const updateSupplieritem = async (data: SupplieritemVO) => {
   return await request.put({ url: `/wms/supplieritem/update`, data })
 }
+// 修改供应商物料
+export const updateSupplieritemSCP = async (data: SupplieritemVO) => {
+  return await request.put({ url: `/wms/supplieritem/updateSCP`, data })
+}
 
 // 删除供应商物料
 export const deleteSupplieritem = async (id: number) => {
   return await request.delete({ url: `/wms/supplieritem/delete?id=` + id })
 }
+export const deleteSupplieritemSCP = async (id: number) => {
+  return await request.delete({ url: `/wms/supplieritem/deleteSCP?id=` + id })
+}
+
 
 // 导出供应商物料 Excel
 export const exportSupplieritem = async (params) => {
@@ -100,3 +111,9 @@ export const selectItembasicTypeToSupplieritem = async (params) => {
 export const getDefaultLocationCode = async(data: SupplieritemVO)=> {
   return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data })
 }
+
+
+// 根据code获取数据列表
+export const getSupplierItemListByCodes = async (data) => {
+  return await request.get({ url: `/wms/supplieritem/listByCodes?supplierCode=`+data.supplierCode +'&itemCodes='+data.itemCodes })
+}

src/api/wms/warehouse/index.ts

@@ -70,3 +70,7 @@ export const pageBusinessTypeToWarehouse = async (params) => {
     return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params })
   }
 }
+// 根据code获取数据列表
+export const getWarehouseByCodes = async (params) => {
+  return await request.get({ url: `/wms/warehouse/listByCodes`, params })
+}

src/components/Annex/src/Annex.vue

@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :title="t('ts.添加附件')" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/>
     </div>
     <div class="list">
@@ -56,6 +56,10 @@ const props = defineProps({
       return ['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']
     }
   },
+  fileSize:{
+    type:Number,
+    required: false,
+  },
   showPreview: {
     type: Boolean,
     required: false

src/components/BasicForm/src/BasicForm.vue

@@ -5,126 +5,143 @@
     :width="dialogWidth"
     :close-on-click-modal="false"
     :vLoading="formLoading"
+    @updateFullscreen="updateFullscreen"
   >
-  
-  <div 
-    style="max-height: 60vh;overflow-y: auto;">
-    <Form
-      ref="formRef"
-      :rules="rules"
-      :schema="formSchema"
-      :is-col="true"
-      @opensearchTable="opensearchTable"
-      @hiddenFilterButton="hiddenSearchTableFilterButton"
-      @changeDialogWidth="changeDialogWidth"
-      @clearSearchInput="clearSearchInput"
-      @onChange="onChange"
-      @onBlur="onBlur"
-      @onEnter="onEnter"
-    >
-      <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
-      
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
-      </template>
-      <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点类型"
-          @change="selectChange('type', $event)"
-          v-if="!isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-        <el-select
-          v-model="formSchema.type"
-          placeholder="选择盘点范围类型"
-          @change="selectChangeDetail('type', $event,formSchema)"
-          v-if="isDetail"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <div style="overflow-y: auto" :style="{ 'max-height': formHeight }">
+      <Form
+        ref="formRef"
+        :rules="rules"
+        :schema="formSchema"
+        :is-col="true"
+        @opensearchTable="opensearchTable"
+        @hiddenFilterButton="hiddenSearchTableFilterButton"
+        @changeDialogWidth="changeDialogWidth"
+        @clearSearchInput="clearSearchInput"
+        @onChange="onChange"
+        @onBlur="onBlur"
+        @onEnter="onEnter"
+      >
+        <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
+          <crontab
+            v-model="formSchema1.crontab"
+            :disabled="
+              formSchema?.find((item) => item.field == 'crontab')?.componentProps?.disabled
+            "
           />
-        </el-select>
-      </template>
-      <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
-        <el-select
-          v-model="formSchema.value"
-          placeholder="选择盘点范围值"
-          multiple
-          v-if="isDetail&& formTypeDetail =='Select'"
+        </template>
+        <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点类型"
+            @change="selectChange('type', $event)"
+            v-if="!isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点范围类型"
+            @change="selectChangeDetail('type', $event, formSchema)"
+            v-if="isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </template>
+        <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.value"
+            placeholder="选择盘点范围值"
+            multiple
+            v-if="isDetail && formTypeDetail == 'Select'"
+          >
+            <el-option
+              v-for="dict in countPlanAllList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
+        </template>
+      </Form>
+      <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
+        <TableForm
+          ref="tableFormRef"
+          class="w-[100%]"
+          :maxHeight="490"
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :tableFormRules="tableFormRules"
+          :isShowButton="isShowButton"
+          :isShowReduceButton="isShowReduceButton"
+          :isShowReduceButtonSelection="isShowReduceButtonSelection"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+          @tableSelectionChange="tableSelectionChange"
+          @tableSelectionDelete="tableSelectionDelete"
+          @extendedButtonsClick="extendedButtonsClick"
+          @formSelectChange="formSelectChange"
+          @formSelectvVisibleChange="formSelectvVisibleChange"
+          @tableSortChange="tableSortChange"
+          @selectCallback="selectCallback"
+          @handleTableSelect="handleTableSelect"
+          @inpuFocus="inpuFocus"
+          @buttonOperationClick="buttonOperationClick"
+          @inputStringBlur="inputStringBlur"
+          @inputNumberChange="inputNumberChange"
+          @tableFormSelectOnBlur="tableFormSelectOnBlur"
+          @formFormDateChange="formFormDateChange"
+          @clearInput="clearInput"
+          @batchAdd="batchAdd"
+          :routeName="routeName"
+          @visibleChange="visibleChange"
         >
-          <el-option
-            v-for="dict in countPlanAllList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-        <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail =='InputString'"/>
-      </template>
-    </Form>
-    <div class="table" v-if="isBusiness && formType == 'create' && fromeWhere != 'countPlan'">
-      <TableForm
-        ref="tableFormRef"
-        class="w-[100%]"
-        :maxHeight = "490"
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :tableFormRules="tableFormRules"
-        :isShowButton="isShowButton"
-        :isShowReduceButton="isShowReduceButton"
-        :isShowReduceButtonSelection="isShowReduceButtonSelection"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-        @tableSelectionChange="tableSelectionChange"
-        @tableSelectionDelete="tableSelectionDelete"
-        @extendedButtonsClick="extendedButtonsClick"
-        @formSelectChange="formSelectChange"
-        @formSelectvVisibleChange="formSelectvVisibleChange"
-        @tableSortChange="tableSortChange"
-        @selectCallback="selectCallback"
-        @handleTableSelect="handleTableSelect"
-        @inpuFocus="inpuFocus"
-        @buttonOperationClick="buttonOperationClick"
-        @inputStringBlur="inputStringBlur"
-        @inputNumberChange="inputNumberChange"
-        @tableFormSelectOnBlur="tableFormSelectOnBlur"
-        @formFormDateChange="formFormDateChange"
-      @clearInput='clearInput'
-      >
-      <template v-slot="{row}">
-        <slot :row="row"></slot>
-      </template>
-    </TableForm>
-    </div>
-    <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
-      <TableFormCountPlan 
-        :tableFields="tableAllSchemas.tableFormColumns"
-        :tableData="tableData"
-        :countScopeType="countScopeType"
-        :tableFormRules="tableFormRules"
-        ref="tableFormRef"
-        @tableFormChange="tableFormChange"
-        @handleAddTable="handleAddTable"
-        @handleDeleteTable="handleDeleteTable"
-      />
+          <template v-slot="{ row }">
+            <slot :row="row"></slot>
+          </template>
+        </TableForm>
+      </div>
+      <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+        <TableFormCountPlan
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :countScopeType="countScopeType"
+          :tableFormRules="tableFormRules"
+          ref="tableFormRef"
+          @tableFormChange="tableFormChange"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+        />
+      </div>
     </div>
-  </div>
-    <template #footer >
+    <template #footer>
       <slot name="foorter"></slot>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
-  
   </Dialog>
-  <SearchTable ref="searchTableRef" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+  <SearchTable
+    ref="searchTableRef"
+    :showSearchTableQueryFields="showSearchTableQueryFields"
+    @searchTableSuccess="searchTableSuccess"
+  >
+  
+    <template #selectionsActions="selections">
+      <slot name="searchTableSelectionsActions" :selections="selections"></slot>
+    </template>
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+      <slot :name="name"></slot>
+    </template>
+  </SearchTable>
 </template>
 <script setup lang="ts">
 import { SearchTable } from '@/components/SearchTable'
@@ -133,7 +150,8 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import { debounce } from 'lodash-es'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/business'
+import { isString } from 'min-dash'
 
 const props = defineProps({
   // 显示窗口宽度设置
@@ -147,9 +165,9 @@ const props = defineProps({
     default: true
   },
   // 是否显示删除按钮--多选
-  isShowReduceButtonSelection:{
+  isShowReduceButtonSelection: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示tableForm 删除按钮
   isShowReduceButton: {
@@ -282,13 +300,13 @@ const props = defineProps({
     default: null
   },
   //是否直接展示搜索表单
-  isOpenSearchTable:{
+  isOpenSearchTable: {
     type: Boolean,
     required: false,
     default: false
   },
 
-  fieldTableColumn:{
+  fieldTableColumn: {
     type: String,
     required: false,
     default: ''
@@ -298,25 +316,31 @@ const props = defineProps({
     formField:form中对应的field,
     tableField:searchtable中对应的field,
   }]*/
-  sumFormDataField:{
+  sumFormDataField: {
     type: Array,
     required: false,
     default: null
   },
-  sumFormDataByForm:{
-    type:Function,
+  sumFormDataByForm: {
+    type: Function,
     required: false,
     default: null
   },
-  sumFormDataByTableCustom:{
-    type:Function,
+  sumFormDataByTableCustom: {
+    type: Function,
     required: false,
     default: null
   },
-  showSearchTableQueryFields:{
+  showSearchTableQueryFields: {
     type: Array,
     required: false,
     default: []
+  },
+  // 失去焦点之后是否进行校验，
+  isJiaoyan: {
+    type: Boolean,
+    required: false,
+    default: false
   }
 })
 
@@ -328,6 +352,10 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
+const formHeight = ref('60vh')
+const updateFullscreen = (isFullscreen) => {
+  formHeight.value = isFullscreen ? 'auto' : '60vh'
+}
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -338,7 +366,10 @@ const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
-console.log(111,formSchema)
+const route = useRoute() // 路由信息
+const routeName = ref('')
+routeName.value = route.name
+const isExecute = ref(true) //如果走失去焦点的方法只有为true的时候才能进行保存
 
 // 列表-按钮
 // const buttondata = [
@@ -371,7 +402,7 @@ const opensearchTable = (
   multiple,
   type,
   row,
-  isConcatDetailSchemas=false,
+  isConcatDetailSchemas = false,
   searchDetailSchemas: any
 ) => {
   const _searchCondition = {}
@@ -379,8 +410,8 @@ const opensearchTable = (
   if (searchCondition && searchCondition.length > 0) {
     // 转换筛选条件所需
     let filters: any[] = []
-    for (var i=0; i< searchCondition.length; i++ ) {
-    // searchCondition.forEach((item) => {
+    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]
@@ -392,19 +423,26 @@ const opensearchTable = (
           : ''
         // 是否含有空参数情况
         let isNull = false
-        if (_searchCondition[searchCondition[i].key] == '' || _searchCondition[searchCondition[i].key] == undefined) {
+        if (
+          _searchCondition[searchCondition[i].key] == '' ||
+          _searchCondition[searchCondition[i].key] == undefined
+        ) {
           isNull = true
         }
         if (isNull) {
-          message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+          message.warning(
+            searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+          )
           return
         }
-      }else if(searchCondition[i].isTableRowValue){
-        if(searchCondition[i].required){
-          if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
-                message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-                return
-            }
+      } else if (searchCondition[i].isTableRowValue) {
+        if (searchCondition[i].required) {
+          if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+            message.warning(
+              searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+            )
+            return
+          }
         }
         row[searchCondition[i].value]
         //查询当前table表数据的值
@@ -414,10 +452,15 @@ const opensearchTable = (
         if (searchCondition[i].isSearch) {
           if (searchCondition[i].isFormModel) {
             //用formModel中的值
-            if(searchCondition[i].required){
-              if (formRef.value.formModel[searchCondition[i].value] == '' ||formRef.value.formModel[searchCondition[i].value] == undefined) {
-                  message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
-                  return
+            if (searchCondition[i].required) {
+              if (
+                formRef.value.formModel[searchCondition[i].value] == '' ||
+                formRef.value.formModel[searchCondition[i].value] == undefined
+              ) {
+                message.warning(
+                  searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+                )
+                return
               }
             }
             filters.push({
@@ -425,14 +468,13 @@ const opensearchTable = (
               column: searchCondition[i].key,
               value: formRef.value.formModel[searchCondition[i].value]
             })
-          }else{
+          } else {
             filters.push({
               action: searchCondition[i].action,
               column: searchCondition[i].key,
               value: searchCondition[i].value
             })
           }
-          
         } else {
           _searchCondition[searchCondition[i].key] = searchCondition[i].value
         }
@@ -463,42 +505,76 @@ const opensearchTable = (
 }
 
 //修改 searchTable 弹窗宽度
-const changeDialogWidth = (width)=>{
+const changeDialogWidth = (width) => {
   searchTableRef.value.changeDialogWidth(width)
 }
-const hiddenSearchTableFilterButton = ()=>{
+const hiddenSearchTableFilterButton = () => {
   searchTableRef.value.hiddenFilterButton()
 }
-const clearSearchInput = (field)=>{
-  emit('clearSearchInput',field)
+const clearSearchInput = (field) => {
+  emit('clearSearchInput', field)
 }
 const sumFormDataByTable = () => {
-  if(props.sumFormDataField){
+  if (props.sumFormDataField) {
     const sumObject = {}
-    props.sumFormDataField.forEach(sumItem=>{
-      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.tableField],0)
+    props.sumFormDataField.forEach((sumItem) => {
+      sumObject[sumItem?.formField] = props.tableData.reduce(
+        (prev, item) => prev + item[sumItem?.tableField],
+        0
+      )
     })
-    nextTick(()=>{
+    nextTick(() => {
       formRef.value.setValues(sumObject)
     })
   }
 }
-watch(()=>props.tableData,() => {
-  sumFormDataByTable()
-  if(props?.sumFormDataByTableCustom&&unref(formRef)?.formModel&&props.tableData){
-    props?.sumFormDataByTableCustom(formRef,unref(formRef)?.formModel,props.tableData)
+watch(
+  () => props.tableData,
+  () => {
+    sumFormDataByTable()
+    if (props?.sumFormDataByTableCustom && unref(formRef)?.formModel && props.tableData) {
+      props?.sumFormDataByTableCustom(formRef, unref(formRef)?.formModel, props.tableData)
+    }
+  },
+  {
+    deep: true
   }
+)
+let originFormModel = {}
+const updateOriginFormModel = (data) => {
+  originFormModel = JSON.parse(JSON.stringify(data))
+}
+const sumFormDataHandle1 = () => {
+  emit(
+    'sumFormDataHandle',
+    formRef,
+    unref(formRef)?.formModel,
+    props.tableData,
+    formType.value,
+    originFormModel,
+    updateOriginFormModel
+  )
+}
 
-},{
-  deep:true
-})
-watch(()=>unref(formRef)?.formModel,() => {
-  if(props?.sumFormDataByForm&&unref(formRef)?.formModel){
-    props?.sumFormDataByForm(formRef,unref(formRef)?.formModel)
+watch(
+  () => unref(formRef)?.formModel,
+  async () => {
+    if (props?.sumFormDataByForm && unref(formRef)?.formModel) {
+      props?.sumFormDataByForm(
+        formRef,
+        unref(formRef)?.formModel,
+        props.tableData,
+        formType.value,
+        originFormModel,
+        updateOriginFormModel,
+        sumFormDataHandle1
+      )
+    }
+  },
+  {
+    deep: true
   }
-},{
-  deep:true
-})
+)
 
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
@@ -507,11 +583,17 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any, titleName?: any, alltitleName?: any) => {
+const open = async (
+  type: string,
+  row?: any,
+  masterParmas?: any,
+  titleName?: any,
+  alltitleName?: any
+) => {
   dialogVisible.value = true
-  if(alltitleName){
+  if (alltitleName) {
     dialogTitle.value = alltitleName
-  }else if (titleName) {
+  } else if (titleName) {
     dialogTitle.value = t('action.' + titleName)
   } else {
     dialogTitle.value = t('action.' + type)
@@ -541,22 +623,25 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
 }
 // 添加数据
 const handleAddTable = () => {
-  if(props.isOpenSearchTable){
+  if (props.isOpenSearchTable) {
     const tableFormKeys = {}
-    tableAllSchemas.value.tableFormColumns.forEach(item => {
+    tableAllSchemas.value.tableFormColumns.forEach((item) => {
       tableFormKeys[item.field] = item.default ? item.default : ''
     })
-    if(props.fieldTableColumn!=''){
-      inpuFocus(tableAllSchemas.value.tableFormColumns.find(item=>item.field==props.fieldTableColumn),tableFormKeys,0)
+    if (props.fieldTableColumn != '') {
+      inpuFocus(
+        tableAllSchemas.value.tableFormColumns.find((item) => item.field == props.fieldTableColumn),
+        tableFormKeys,
+        0
+      )
     }
-  }else{
+  } else {
     emit('handleAddTable')
   }
-  
 }
 
 /** 弹窗按钮 */
-let Butttondata:any = []
+let Butttondata: any = []
 if (props.isShowFooterButtton) {
   Butttondata = [
     defaultButtons.formSaveBtn(null), // 保存
@@ -571,9 +656,9 @@ if (props.footButttondata) {
 const buttonBaseClick = (val) => {
   // 扩展 按钮事件回调
   if (props.footButttondata) {
-    emit('footButtonClick',val)
+    emit('footButtonClick', val)
   }
-   // 保存
+  // 保存
   else if (val == 'save') {
     submitForm()
   }
@@ -670,15 +755,20 @@ const emit = defineEmits([
   'formFormDateChange',
   'footButtonClick',
   'clearSearchInput',
-  'clearInput'
+  'clearInput',
+  'sumFormDataHandle',
+  'visibleChange'
 ])
+const visibleChange = (field, val, row, index) => {
+  emit('visibleChange', field, val, row, index)
+}
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
   emit('formSelectChange', field, val, row)
 }
 // 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
 }
 const formSelectvVisibleChange = (field, val, row) => {
   emit('formSelectvVisibleChange', field, val, row)
@@ -715,14 +805,11 @@ const handleTableSelect = (row, column, event) => {
 
 // 删除数据
 const handleDeleteTable = (row, index) => {
-  emit('handleDeleteTable', row, index,formRef.value)
+  emit('handleDeleteTable', row, index, formRef.value)
 }
 
-
-
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  
   emit('inpuFocus', headerItem, row, index)
 
   opensearchTable(
@@ -740,7 +827,7 @@ const inpuFocus = (headerItem, row, index) => {
   )
 }
 const clearInput = (field, row, index) => {
-  emit('clearInput',field, row, index)
+  emit('clearInput', field, row, index)
 }
 /**
  * 监听改变事件
@@ -756,16 +843,281 @@ const onChange = (field, cur) => {
  * @param field 当前操作字段
  * @param e
  */
-const onBlur = (field, e) => {
-  emit('onBlur', field, e)
+const onBlur = async (field, e) => {
+  isExecute.value = false
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch) {
+    if (formSchemaObj.searchPage && formSchemaObj.verificationParams) {
+      //获取data.ts参数信息
+      let searchCondition =
+        formSchema.value.find((item) => item.field == field)?.componentProps?.searchCondition || []
+      //获取失去焦点参数信息
+      let verificationParams =
+        formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams ||
+        []
+      console.log('走新方法啦')
+      // searchCondition = [...searchCondition, ...verificationParams]
+
+      if (e && isString(e)) {
+        let setV = {}
+        setV[field] = ''
+        let params = {}
+        const _searchCondition = {}
+        let filters: any[] = []
+        if (searchCondition && searchCondition.length > 0) {
+          // 转换筛选条件所需
+          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
+              }
+              filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: formRef.value.formModel[searchCondition[i].value]
+              })
+            }
+
+            // else if (searchCondition[i].isTableRowValue) {
+            //   if (searchCondition[i].required) {
+            //     if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+            //       message.warning(
+            //         searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+            //       )
+            //       return
+            //     }
+            //   }
+            //   row[searchCondition[i].value]
+            //   //查询当前table表数据的值
+            //   _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
+            // }
+            else {
+              // 扩展 转换为筛选条件进行查询
+              if (searchCondition[i].isSearch) {
+                if (searchCondition[i].isFormModel) {
+                  //用formModel中的值
+                  if (searchCondition[i].required) {
+                    if (
+                      formRef.value.formModel[searchCondition[i].value] == '' ||
+                      formRef.value.formModel[searchCondition[i].value] == undefined
+                    ) {
+                      message.warning(
+                        searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+                      )
+                      return
+                    }
+                  }
+                  filters.push({
+                    action: searchCondition[i].action || '==',
+                    column: searchCondition[i].key,
+                    value: formRef.value.formModel[searchCondition[i].value]
+                  })
+                } else {
+                  filters.push({
+                    action: searchCondition[i].action || '==',
+                    column: searchCondition[i].key,
+                    value: searchCondition[i].value
+                  })
+                }
+              } else {
+                filters.push({
+                action: searchCondition[i].action || '==',
+                column: searchCondition[i].key,
+                value: searchCondition[i].value
+              })
+              }
+            }
+          }
+        }
+        if (verificationParams && verificationParams.length > 0) {
+          // 转换筛选条件所需
+          for (var i = 0; i < verificationParams.length; i++) {
+            // 扩展 转换为筛选条件进行查询
+            if (verificationParams[i].isSearch) {
+              if (verificationParams[i].isFormModel) {
+                filters.push({
+                  action: verificationParams[i].action,
+                  column: verificationParams[i].key,
+                  value: formRef.value.formModel[verificationParams[i].value]
+                    ? formRef.value.formModel[verificationParams[i].value]
+                    : e.trim()
+                })
+              } else {
+                filters.push({
+                  action: verificationParams[i].action,
+                  column: verificationParams[i].key,
+                  value: verificationParams[i].value
+                })
+              }
+            } else {
+              _searchCondition[verificationParams[i].key] = verificationParams[i].value
+            }
+          }
+        }
+        if (filters.length > 0) {
+          _searchCondition.isSearch = true
+          _searchCondition.filters = filters
+        }
+        console.log(4545, _searchCondition)
+        let obj = {
+          by: 'ASC',
+          pageNo: 1,
+          pageSize: 20
+        }
+        console.log(888,_searchCondition)
+        params = {
+          isSearch:_searchCondition.isSearch,
+          filters:_searchCondition.filters,
+          ...obj
+        }
+        // console.log(333,params)
+        if (!formSchemaObj?.multiple && e.indexOf(',') > -1) {
+          message.alert('该输入框只能输入一条数据')
+          formRef.value.setValues(setV)
+          return
+        }
+        await formSchemaObj.searchPage(params).then((res) => {
+          let arr1 = e.split(',')
+          let list = ref([])
+          list.value = res.list
+          if (list.value?.length == 0) {
+            message.alert('暂无数据')
+            formRef.value.setValues(setV)
+            return
+          }
+          if (arr1.length != list.value.length) {
+            let arr2 = list.value.map((item) => item.code)
+            let str = [
+              ...arr1.filter((item) => !arr2.includes(item)),
+              ...arr2.filter((item) => !arr1.includes(item))
+            ].join(',')
+            message.alert('代码' + str + '没有找到对应数据')
+            formRef.value.setValues(setV)
+            return
+          }
+        })
+      }
+    } else {
+      if (
+        field == 'supplierCode' ||
+        field == 'itemCode' ||
+        field == 'productItemCode' ||
+        field == 'componentItemCode' ||
+        field == 'packUnit' ||
+        field == 'inPackUnit' ||
+        field == 'fromPackingNumber'
+      ) {
+        await FormBlur(
+          field,
+          e,
+          routeName.value,
+          formRef.value,
+          props.detailData,
+          formSchema.value,
+          (searchField, list) => {
+            emit('searchTableSuccess', field, searchField, list, formRef.value, 'form')
+          }
+        )
+        return
+      }
+    }
+  } else {
+    emit('onBlur', field, e)
+  }
+  isExecute.value = true
+}
+
+
+// 批量增加
+const batchAdd = async (val) => {
+  const row = {}
+  tableAllSchemas.value.tableFormColumns.forEach((item) => {
+    row[item.field] = item.default ? item.default : ''
+  })
+  const headerItem = tableAllSchemas.value.tableColumns.find(
+    (item) => item.field == props.fieldTableColumn
+  )
+
+  await getListByBottonInput(
+    headerItem,
+    val,
+    row,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        'itemCode',
+        list,
+        formRef.value,
+        'tableForm',
+        row
+      )
+    }
+  )
 }
+
+const inputStringBlur = async (headerItem, val, row, index) => {
+  // isExecute.value = false
+  await tableFormBlurVer(
+    headerItem,
+    val,
+    row,
+    index,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (searchField, list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        searchField,
+        list,
+        formRef.value,
+        'tableForm',
+        row,
+        'blur',
+        index
+      )
+    }
+  )
+
+  // isExecute.value = true
+}
+
 /**
  * 回车事件
  * @param field 当前操作字段
  * @param e
  */
-const onEnter = (field,value, e) => {
-  emit('onEnter', field,value, e)
+const onEnter = (field, value, e) => {
+  emit('onEnter', field, value, e)
 }
 
 // 修改盘点类型
@@ -773,25 +1125,30 @@ const selectChange = (field, val) => {
   emit('selectChange', field, val)
 }
 // 修改盘点范围类型
-const selectChangeDetail = (field, val,formSchema) => {
+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 buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
 }
 
-const inputStringBlur = (headerItem, row, index)=> {
-  emit("inputStringBlur", headerItem, row, index);
-}
-defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handleAddTable,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
-
+defineExpose({
+  open,
+  formRef,
+  opensearchTable,
+  dialogVisible,
+  formLoading,
+  handleAddTable,
+  changeDialogWidth,
+  searchTableRef,
+  tableFormRef
+}) // 提供 open 方法，用于打开弹窗
 </script>
 <style lang="scss" scoped>
 .table {
@@ -820,8 +1177,8 @@ defineExpose({ open, formRef, opensearchTable, dialogVisible, formLoading ,handl
 
 ::v-deep(.el-icon) {
   display: block;
-}button
-.button {
+}
+button .button {
   > div {
     display: flex;
     align-items: center;

src/components/BasicForm/src/BasicFormWmsCount.vue

@@ -24,7 +24,7 @@
     >
       <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
       
-        <crontab v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
+        <crontab v-if="formSchema1.type=='CYCLE'"  v-model="formSchema1.crontab" :disabled="formSchema?.find(item=>item.field == 'crontab')?.componentProps?.disabled "/>
       </template>
       <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
         <el-select
@@ -662,6 +662,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     try {
       nextTick(() => {
         formRef.value.setValues(row)
+        formRef1.value.setValues(row)
       })
     } finally {
       formLoading.value = false
@@ -670,6 +671,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     if(row){
       nextTick(() => {
         formRef.value.setValues(row)
+        formRef1.value.setValues(row)
       })
     }
   }
@@ -745,7 +747,8 @@ const submitForm = async () => {
       // 主子表——提交请求
       try {
         const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
+        const data1 = unref(formRef1)?.formModel
+        emit('submitForm', formType.value, {...data,...data1})
       } finally {
         formLoading.value = false
       }
@@ -753,7 +756,8 @@ const submitForm = async () => {
       // 编辑
       try {
         const data = unref(formRef)?.formModel
-        emit('submitForm', formType.value, data)
+        const data1 = unref(formRef1)?.formModel
+        emit('submitForm', formType.value, {...data})
       } finally {
         formLoading.value = false
       }

src/components/Descriptions/src/Descriptions.vue

@@ -127,6 +127,7 @@ const showAll = () =>{
             :label-align="labelAlign"
             :label-class-name="labelClassName"
             :width="width"
+            :span="item.span"
           >
             <template #label>
               <slot

src/components/Detail/src/Detail.vue

@@ -18,8 +18,8 @@
           :data="detailData"
           labelClassName="label-class-name"
           label-align="left"
-          direction="vertical"
-          :column="8"
+          :direction="direction"
+          :column="column"
           :schema="allSchemas.detailSchema"
           :columns="2"
           width="200px"
@@ -108,6 +108,7 @@
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
                   :fileType="annexItem.fileType"
+                  :fileSize="annexItem.fileSize"
                   :showAddBtn="!annexItem.hiddenUpload"
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
@@ -134,7 +135,7 @@
 
         </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
+        <ContentWrap v-if="!annexAlias.hidden" class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <Annex
@@ -149,7 +150,6 @@
           </ElScrollbar> 
         </ContentWrap>
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 备注组件 -->
             <Remarks
@@ -161,7 +161,6 @@
           </ElScrollbar> 
         </ContentWrap>
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
             <!-- 变更记录组件 -->
             <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
@@ -239,6 +238,7 @@ const props = defineProps({
     type: Object,
     required: false,
     default: ()=>({
+      hidden:false,
       label: '附件',
       showDownload:false,
       showPreview:false,
@@ -408,6 +408,16 @@ const props = defineProps({
     required: false,
     default: null
   },
+  direction:{
+    type: String,
+    required: false,
+    default: 'vertical'
+  },
+  column:{
+    type: Number,
+    required: false,
+    default: 8
+  }
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -432,7 +442,8 @@ if (props.isBasic == true) {
   }
 }
 
-const otherList = [...props.annexTable,{
+
+let otherList = [...props.annexTable,{
     label:props.annexAlias.label,
     prop:'Annex'
   },{
@@ -442,6 +453,15 @@ const otherList = [...props.annexTable,{
     label:'变更记录',
     prop:'ChangeRecord'
 }]
+if(props.annexAlias.hidden){
+  otherList = [...props.annexTable,{
+      label:'备注',
+      prop:'Remarks'
+    },{
+      label:'变更记录',
+      prop:'ChangeRecord'
+  }]
+}
 tabsList.value = [...tabsList?.value,...otherList]
 
 if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
@@ -525,6 +545,7 @@ const getAnnexFileList =  async (row) => {
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
         fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
@@ -614,6 +635,9 @@ const titleNameRef = ref()
 const titleValueRef = ref()
 const count  =ref(0)
 const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  if(tabRef.value){
+    tabRef.value.changeCurrent(0)
+  }
   annexTableData.value = []
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
@@ -638,6 +662,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     detailLoading.value = true
     try {
       detailData.value = row
+      searchTableFormModel.value = {...searchTableFormModel.value,...row}
       getRemarkList()
       getFileList()
       getAnnexFileList(row)

src/components/Dialog/src/Dialog.vue

@@ -3,6 +3,10 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 defineOptions({ name: 'Dialog' })
 
+// 传递给父类
+const emit = defineEmits([
+  'updateFullscreen'
+])
 const slots = useSlots()
 
 const props = defineProps({
@@ -32,6 +36,7 @@ const isFullscreen = ref(false)
 
 const toggleFull = () => {
   isFullscreen.value = !unref(isFullscreen)
+  emit('updateFullscreen',isFullscreen.value)
 }
 
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)

src/components/DictTag/src/DictTag.vue

@@ -45,20 +45,22 @@ export default defineComponent({
       // 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
       // 根据 dictDataList 进行区分 是否多个
       if (dictDataList.length == 0) {
-        return (
-            <ElTag
-              style={dictData.value?.cssClass ? 'color: #fff' : ''}
-              type={dictData.value?.colorType}
-              color={
-                dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
-                  ? dictData.value?.cssClass
-                  : ''
-              }
-              disableTransitions={true}
-            >
-              {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
-          </ElTag>
-        )
+          if(dictData.value?.label !== '' && dictData.value?.label !== undefined){
+            return (<ElTag
+                  style={dictData.value?.cssClass ? 'color: #fff' : ''}
+                  type={dictData.value?.colorType}
+                  color={
+                    dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
+                      ? dictData.value?.cssClass
+                      : ''
+                  }
+                  disableTransitions={true}
+                >
+                  {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
+              </ElTag>
+            )
+          }
+          
       } else {
         return (
           dictDataList.map(item => {

src/components/Form/src/Form.vue

@@ -126,7 +126,7 @@ export default defineComponent({
     }
 
     const clearSearchInput = (field) => {
-      emit('clearSearchInput')
+      emit('clearSearchInput',field)
     }
     expose({
       setValues,
@@ -269,7 +269,11 @@ export default defineComponent({
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
                   }
-              }} v-slots={{
+              }} 
+              
+              onBlur={(e)=>{onBlur(item.field, e)}}
+              onChange={(e)=>{onChange(item.field, e)}}
+              v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){
@@ -318,7 +322,11 @@ export default defineComponent({
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
                   }
-              }} disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
+              }}
+              
+              onBlur={(e)=>{onBlur(item.field,formModel.value[item.field])}}
+              onChange={(e)=>{onChange(item.field,formModel.value[item.field])}}
+               disabled={item?.componentProps?.enterSearch?false:true} v-slots={{
                   suffix: () => (
                     <ElButton type="text" icon={CircleClose} style="color:var(--el-button-text-color)" onClick={()=>{
                       if(Array.isArray(formModel.value[item.field])){

src/components/RouterSearch/index.vue

@@ -17,8 +17,8 @@
       />
     </el-select> -->
   </ElDialog>
-  <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
-    <Icon icon="ep:search" />
+  <div v-else class="custom-hover custom-hover2" @click.stop="showTopSearch = !showTopSearch">
+    <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
       :reserve-keyword="false"
@@ -170,4 +170,7 @@ defineExpose({
 .w-220px {
     width: 220px !important;
 }
+.custom-hover2:hover{
+  background-color: transparent;
+}
 </style>

src/components/Search/src/Search.vue

@@ -9,6 +9,7 @@ import { FormSchema } from '@/types/form'
 
 import { useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache()
+const message = useMessage() // 消息弹窗
 
 defineOptions({ name: 'Search' })
 
@@ -40,10 +41,26 @@ const props = defineProps({
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
+  showSearchTableQueryFields:{
+    type: Array,
+    required: false,
+    default: []
   }
 })
 
-const emit = defineEmits(['search', 'reset','onInput'])
+const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -91,7 +108,125 @@ const { register, elFormRef, methods } = useForm({
 const onInput = (field,value) => {
   emit('onInput', field,value)
 } 
+const onChange = (field, value)=>{
+  emit('onChange', field,value)
+}
+const searchTableRef = ref()
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row,
+  isConcatDetailSchemas=false,
+  searchDetailSchemas: any
+) => {
+  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) {
+        let keyValue = formRef.value.formModel[searchCondition[i].value]
+          ? formRef.value.formModel[searchCondition[i].value]
+          : props.detailData
+          ? props.detailData[searchCondition[i].value]
+          : row
+          ? row[searchCondition[i].value]
+          : ''
+          
+        if(searchCondition[i].isCSV&&keyValue){
+          //用逗号分隔取参数
+          if(Array.isArray(keyValue)){
+            keyValue = keyValue.join(',')
+          }else{
+            keyValue = keyValue.split(' ')
+            keyValue.forEach(item=>{item = item.trim()})
+            keyValue = keyValue.join(',')
+          }
+          console.log('keyValue',keyValue)
+        }
+        _searchCondition[searchCondition[i].key] = keyValue
+        if(searchCondition[i].required){
+          // 是否含有空参数情况
+          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].isTableRowValue){
+        if(searchCondition[i].required){
+          if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
+                message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                return
+            }
+        }
+        row[searchCondition[i].value]
+        //查询当前table表数据的值
+        _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          if (searchCondition[i].isFormModel) {
+            //用formModel中的值
+            if(searchCondition[i].required){
+              if (formRef.value.formModel[searchCondition[i].value] == '' ||formRef.value.formModel[searchCondition[i].value] == undefined) {
+                  message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！')
+                  return
+              }
+            }
+            filters.push({
+              action: searchCondition[i].action,
+              column: searchCondition[i].key,
+              value: formRef.value.formModel[searchCondition[i].value]
+            })
+          }else{
+            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,
+    undefined,
+    isConcatDetailSchemas,
+    searchDetailSchemas
+  )
+}
 const formRef = ref()
 const setFormValues = (formData)=>{
   formRef.value.setValues(formData)
@@ -124,6 +259,11 @@ const setVisible = () => {
   unref(elFormRef)?.resetFields()
   visible.value = !unref(visible)
 }
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
 const Search = ref()
 onMounted(() => {})
 defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
@@ -143,6 +283,8 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       hide-required-asterisk
       @register="register"
       @onInput="onInput"
+      @opensearchTable="opensearchTable"
+      @onChange="onChange"
     >
       <template #action>
         <div v-if="layout === 'inline'">
@@ -188,6 +330,8 @@ defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
       <slot name="actionMore"></slot>
     </div>
   </template>
+  <SearchTable ref="searchTableRef" :hiddenFilterBtnFields="hiddenFilterBtnFields" :showSearchTableQueryFields="showSearchTableQueryFields" @searchTableSuccess="searchTableSuccess" />
+
 </template>
 <style lang="scss" scoped>
 .search ::v-deep(.el-form-item) {

src/components/SearchTable/src/SearchTable.vue

@@ -1,6 +1,7 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth" >
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth">
     <!-- 搜索工作栏 -->
+    <slot :name="'searchQuery'+formFieldRef"></slot>
     <ContentWrap v-if="searchQuery">
       <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
     </ContentWrap>
@@ -14,7 +15,8 @@
       :allSchemas="allSchemasRef"
     />
     <ContentWrap>
-      <Table v-clientSearchTable
+      <Table
+        v-clientSearchTable
         ref="searchTableRef"
         :columns="tableColumns"
         :data="tableObjectRef.tableList"
@@ -30,10 +32,12 @@
         :selectionTotal="multipleBol"
         :reserveSelection="true"
         row-key="id"
+        @rowClick="rowClick"
       />
     </ContentWrap>
     <template #footer>
       <div class="flex items-center">
+        <slot name="selectionsActions" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
         <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
         <el-button @click="searchDialogVisible = false">取 消</el-button>
 
@@ -45,11 +49,16 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 const props = defineProps({
-  showSearchTableQueryFields:{
+  showSearchTableQueryFields: {
     type: Array,
     required: false,
     default: []
-  }
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -63,23 +72,25 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const multipleBol = ref(false)
 
-
 // 列表头部按钮
-const HeadButttondata = ref(multipleBol.value?
-[
-  defaultButtons.defaultWhenPageBtn(null), // 选择当页
-  defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-  // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-  defaultButtons.defaultFilterBtn(null), // 筛选
-]:[
-  defaultButtons.defaultFilterBtn(null) // 筛选
-])
+const HeadButttondata = ref(
+  multipleBol.value
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+)
 
 /** 打开弹窗 */
 const getListRef = ref()
 const setSearchParamsRef = ref()
 const tableObjectRef = ref()
-const getPage:any = ref()
+const getPage: any = ref()
 const searchSchema = ref()
 const tableColumns = ref()
 const formFieldRef = ref()
@@ -88,20 +99,23 @@ const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
 const searchConditionRef = ref()
-const searchTableSelectionsList = ref()//表格弹窗回显的列表
+const searchTableSelectionsList = ref() //表格弹窗回显的列表
 const searchQuery = ref(false)
+const hiddenFilterBtn = ref(false)
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
   dialogWidth.value = '80%'
   multipleBol.value = multiple
-  HeadButttondata.value = multiple?[
-    defaultButtons.defaultWhenPageBtn(null), // 选择当页
-    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]:[
-    defaultButtons.defaultFilterBtn(null), // 筛选
-  ]
-  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
+  HeadButttondata.value = multiple
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
   tableObjectRef.value = tableObject
   searchDialogVisible.value = true
   allSchemasRef.value = allSchemas
@@ -110,45 +124,52 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
 }
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => {
   searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false
+  hiddenFilterBtn.value = props.hiddenFilterBtnFields.find(item=>item==formField)?true:false
+  
   dialogWidth.value = '80%'
   multipleBol.value = multiple
+   
+  const filterBtns = hiddenFilterBtn.value?[]:[defaultButtons.defaultFilterBtn(null)]
+  
   HeadButttondata.value = multiple?[
     defaultButtons.defaultWhenPageBtn(null), // 选择当页
     defaultButtons.defaultUnselectPageBtn(null), // 反选当页
     // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
-    defaultButtons.defaultFilterBtn(null), // 筛选
+    ...filterBtns, // 筛选
   ]:
   [
-    defaultButtons.defaultFilterBtn(null), // 筛选
+    ...filterBtns, // 筛选
   ]
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
-  if(isConcatDetailSchemas){
+  if (isConcatDetailSchemas) {
     //主子表合并
-    console.log('detailSchemas',detailSchemas)
-    tableColumns.value = [...allSchemas?.tableColumns,...detailSchemas?.tableMainColumns].filter(item => (item.field !== 'action'))
-  }else{
-    tableColumns.value = allSchemas?.tableColumns.filter(item => (item.field !== 'action'))
+    console.log('detailSchemas', detailSchemas)
+    tableColumns.value = [...allSchemas?.tableColumns, ...detailSchemas?.tableMainColumns].filter(
+      (item) => item.field !== 'action'
+    )
+  } else {
+    tableColumns.value = allSchemas?.tableColumns.filter((item) => item.field !== 'action')
   }
   getPage.value = getApiPage
   typeRef.value = type
   rowRef.value = row
   // dialogTitle.value = t('action.' + type)
-  dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
   searchTableSelectionsList.value = searchTableSelections
 
-  const {tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: getPage.value // 分页接口
   })
   tableObjectRef.value = tableObject
   searchConditionRef.value = searchCondition
-  if (searchCondition) tableObjectRef.value.params = searchCondition;
+  if (searchCondition) tableObjectRef.value.params = searchCondition
 
   // 获得表格的各种操作
-  const { getList , setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
   setSearchParamsRef.value = setSearchParams
   getListRef.value = getList
   getList()
@@ -157,7 +178,7 @@ const dialogWidth = ref('80%')
 const changeDialogWidth = (width: any) => {
   dialogWidth.value = width
 }
-const hiddenFilterButton = ()=>{
+const hiddenFilterButton = () => {
   HeadButttondata.value = []
 }
 
@@ -170,30 +191,30 @@ const searchFormClick = (searchData) => {
   // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
   if (searchData.filters) {
     if (searchConditionRef.value.filters) {
-      Object.keys(searchConditionRef.value.filters).forEach(key => {
+      Object.keys(searchConditionRef.value.filters).forEach((key) => {
         searchData.filters.push(searchConditionRef.value.filters[key])
-      });
+      })
     } else {
-      Object.keys(searchConditionRef.value).forEach(key => {
+      Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
-          action: "==",
+          action: '==',
           column: key,
           value: searchConditionRef.value[key]
         })
-      });
+      })
     }
   } else {
     if (searchConditionRef.value.filters) {
       searchData.filters = searchConditionRef.value.filters
     } else {
       searchData.filters = []
-      Object.keys(searchConditionRef.value).forEach(key => {
+      Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
-          action: "==",
+          action: '==',
           column: key,
           value: searchConditionRef.value[key]
         })
-      });
+      })
     }
   }
   tableObjectRef.value.params = {
@@ -217,7 +238,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 
-defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
 const searchTableRef = ref()
@@ -229,15 +250,15 @@ const submitForm = async () => {
   formLoading.value = true
   const selections = searchTableRef.value.selections
   // 如果不是多选的
-  if(!multipleBol.value){
-    if(selections.length > 1 || selections.length == 0) {
+  if (!multipleBol.value) {
+    if (selections.length > 1 || selections.length == 0) {
       message.warning('请选择一条数据！')
       formLoading.value = false
       return
     }
     // 多选
-  }else{
-    if(selections.length == 0) {
+  } else {
+    if (selections.length == 0) {
       message.warning('至少选择一条数据！')
       formLoading.value = false
       return
@@ -247,11 +268,29 @@ const submitForm = async () => {
   try {
     searchDialogVisible.value = false
     // 发送操作成功的事件
-    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
+    emit(
+      'searchTableSuccess',
+      formFieldRef.value,
+      searchFieldRef.value,
+      selections,
+      typeRef.value,
+      rowRef.value
+    )
   } finally {
     formLoading.value = false
   }
 }
+const rowClick = (row: any, column: any, event: Event) => {
+  const selected = searchTableRef.value?.elTableRef
+    ?.getSelectionRows()
+    .some((item) => item.id === row.id)
+  if (!selected) {
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, true)
+  } else {
+    // 取消
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
+  }
+}
 </script>
 <style scoped lang="scss">
 </style>

src/components/Table/src/Table.vue

@@ -62,8 +62,9 @@ export default defineComponent({
     },
     searchTableSelectionsList:[],//回显列表
     selectionColor: propTypes.bool.def(false),
+    rowKey: propTypes.string.def(''),
   },
-  emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows'],
+  emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
     const elTableRef = ref<ComponentRef<typeof ElTable>>()
 
@@ -120,12 +121,24 @@ export default defineComponent({
     const sortRef = ref()
     // 选中某行
     const selectRow  = ()=>{
+      console.log(currentPageRef.value,elTableRef.value?.getSelectionRows())
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
     //全选回调
     const selectAll  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
+    const rowClick  = (row: any, column: any, event: Event)=>{
+      // const selected = elTableRef.value?.getSelectionRows().some(item => item.id === row.id)
+      // if (!selected) {
+      //     elTableRef.value?.toggleRowSelection(row, true);
+      //  } else {
+      //     // 取消
+      //   elTableRef.value?.toggleRowSelection(row, false);
+      // }
+      // console.log(elTableRef.value?.getSelectionRows())
+      emit('rowClick',row,column,event)
+    }
     //反选
     const togglePageSelection = ()=>{
       unref(getProps).data.forEach(row=>{
@@ -165,7 +178,8 @@ export default defineComponent({
       selectAll,
       toggleAllSelection,
       togglePageSelection,
-      clearSelection
+      clearSelection,
+      elTableRef
     })
 
     const pagination = computed(() => {
@@ -388,6 +402,8 @@ export default defineComponent({
           onSelect-all={selectAll}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
+          row-key={unref(getProps).rowKey}
+          onRow-click={rowClick}
           {...unref(getBindValue)} 
         >
           {{
@@ -397,7 +413,7 @@ export default defineComponent({
           }}
         </ElTable>
         {unref(getProps).selectionTotal ? (
-          <div class="mt-5px">已选{selections.value.length}条数据</div>
+          <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{selections.value.length}条数据</div>
         ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
@@ -416,18 +432,17 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.expandTable .el-table .tableHeader{
+.expandTable .el-table .tableHeader {
   --el-table-header-bg-color: #f5f5f5;
 }
-.expandTable .el-table .tableRow{
+.expandTable .el-table .tableRow {
   --el-table-tr-bg-color: #f5f5f5;
-  --el-bg-color:#f5f5f5;
+  --el-bg-color: #f5f5f5;
 }
 
-.el-table .selectionRow{
+.el-table .selectionRow {
   --el-table-tr-bg-color: var(--el-color-primary-light-9);
 }
-
 </style>
 <style lang="scss" scoped>
 :deep(.el-button.is-text) {
@@ -439,5 +454,4 @@ export default defineComponent({
   padding: 8px 4px;
   margin-left: 0;
 }
-
 </style>

src/components/TableForm/src/TableForm.vue

@@ -1,7 +1,8 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table class="multipleTableComponents"
+    <el-table
+      class="multipleTableComponents"
       ref="TableBaseComponents_Ref"
       v-loading="tableLoading"
       :data="showTableData()"
@@ -13,7 +14,13 @@
       @row-click="handleTableSelect"
     >
       <!-- 删除按钮多选 -->
-      <el-table-column fixed="left" type="selection" width="50" v-if="isShowReduceButtonSelection"  :reserve-selection="true" />
+      <el-table-column
+        fixed="left"
+        type="selection"
+        width="50"
+        v-if="isShowReduceButtonSelection"
+        :reserve-selection="true"
+      />
       <!-- 删除按钮 -->
       <el-table-column
         fixed="left"
@@ -21,7 +28,13 @@
         v-else-if="isShowReduceButton"
         v-slot="{ row, $index }"
       >
-        <Icon icon="ep:remove" color="#757575" :size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
+        <Icon
+          icon="ep:remove"
+          color="#757575"
+          :size="26"
+          style="cursor: pointer; margin-top: -16px"
+          @click.stop="handleDeleteTable(row, $index)"
+        />
       </el-table-column>
       <!-- 多选 -->
       <el-table-column
@@ -30,7 +43,6 @@
         :reserve-selection="true"
         type="selection"
         :width="50"
-        
       />
       <!-- 序号 -->
       <el-table-column
@@ -43,145 +55,179 @@
       />
       <el-table-column
         v-slot="{ row, $index }"
-        v-for="(headerItem) in tableFields.filter(item=>(!item.hidden))" 
+        v-for="headerItem in tableFields.filter((item) => !item.hidden)"
         :key="headerItem"
         :fixed="headerItem.tableForm?.fixed"
-        :label="t(`ts.${headerItem.label}`).replace('ts.','')" :prop="headerItem.field"
+        :label="t(`ts.${headerItem.label}`).replace('ts.', '')"
+        :prop="headerItem.field"
         :align="headerItem?.tableForm?.align || 'center'"
         :sortable="headerItem?.tableForm?.sortable || false"
-        :width="headerItem?.tableForm?.width || '200px'" 
-        :min-width="headerItem?.tableForm?.minWidth || 'auto'">
+        :width="headerItem?.tableForm?.width"
+        :min-width="headerItem?.tableForm?.minWidth || '200px'"
+      >
         <el-form
           ref="TableBaseForm_Ref"
           :model="row"
-          style="width: 100%;" 
+          style="width: 100%"
           :rules="tableFormRules"
-          :class="tableFormRules ? '' : 'noRulesForm'">
+          :class="tableFormRules ? '' : 'noRulesForm'"
+          @click.stop=""
+        >
           <!-- 字符串输入框 -->
           <el-form-item
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
-            :prop="headerItem.field" style="display: flex;align-items: center;">
-            <el-input  :key="headerItem.field+$index"
+            :prop="headerItem.field"
+            style="display: flex; align-items: center"
+          >
+            <el-input
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
-              :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')"
-              :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
-              style="flex:1" 
-              @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
+              :placeholder="
+                t(
+                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                ).replace('ts.', '')
+              "
+              :disabled="disabledInput(headerItem, row)"
+              style="flex: 1"
+              @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
+              @clear='clearInput(headerItem.field, row, index)'
             />
-            <Icon icon="ep:circle-close"  v-if="headerItem?.tableForm?.isInpuFocusShow && headerItem?.tableForm?.disabled&& headerItem?.tableForm?.clearable" style='position:absolute;right:50px;cursor: pointer;' @click="clearInput(headerItem.field,row,index)"/>
-            <el-button  :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
+            <Icon
+              icon="ep:circle-close"
+              v-if="
+                headerItem?.tableForm?.isInpuFocusShow &&
+                headerItem?.tableForm?.disabled &&
+                headerItem?.tableForm?.clearable
+              "
+              style="position: absolute; right: 50px; cursor: pointer"
+              @click="clearInput(headerItem.field, row, index)"
+            />
+            <el-button
+              :key="headerItem.field + $index + 'button'"
+              v-if="headerItem?.tableForm?.isInpuFocusShow"
+              @click="inpuFocus(headerItem, row, index)"
+              ><Icon icon="ep:search" size="14"
+            /></el-button>
           </el-form-item>
-          <el-form-item  v-if="headerItem?.tableForm?.type == 'slot'">
+          <el-form-item v-if="headerItem?.tableForm?.type == 'slot'">
             <slot :row="row"></slot>
           </el-form-item>
           <!-- 金额输入框 -->
-            <el-form-item 
-              v-if="headerItem?.tableForm?.type == 'number'"
-              :prop="headerItem.field">
-              <el-input :key="headerItem.field+$index"
-                v-model="row[headerItem.field]"
-                clearable
-                type="number"
-                :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-                :disabled="itemIsDisabled(headerItem, row)" 
-                style="width: 100%;" 
-                @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
-              />
-            </el-form-item>
+          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" >
+            <el-input
+              :key="headerItem.field + $index"
+              v-model="row[headerItem.field]"
+              clearable
+              type="number"
+              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+              :disabled="itemIsDisabled(headerItem, row)"
+              style="width: 100%"
+              @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
+            />
+          </el-form-item>
           <!-- 数字输入框 -->
           <el-form-item
             v-if="headerItem?.tableForm?.type == 'InputNumber'"
-            :prop="headerItem.field">
+            :prop="headerItem.field"
+          >
             <el-input-number
-              style="width: 100%;" 
-              :key="headerItem.field+$index"
+              style="width: 100%"
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :max="headerItem?.tableForm?.max"
               :min="headerItem?.tableForm?.min"
               :precision="headerItem?.tableForm?.precision"
               :disabled="itemIsDisabled(headerItem, row)"
-              @change="(e)=>{inputNumberChange(headerItem.field, $index, row, e)}"
+              @change="
+                (e) => {
+                  inputNumberChange(headerItem.field, $index, row, e)
+                }
+              "
             />
           </el-form-item>
           <!-- 下拉框 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Select'" 
-            :prop="headerItem.field">
-            <el-select :key="headerItem.field+$index"
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
+            <el-select
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="headerItem?.tableForm.clearable || true"
               :multiple="headerItem?.tableForm.multiple"
               :size="headerItem?.tableForm.size"
-              :collapse-tags ="headerItem?.tableForm.collapseTags" 
-              :collapse-tags-tooltip ="headerItem?.tableForm.collapseTagsTooltip" 
-              :multiple-limit ="headerItem?.tableForm.multipleLimit" 
+              :collapse-tags="headerItem?.tableForm.collapseTags"
+              :collapse-tags-tooltip="headerItem?.tableForm.collapseTagsTooltip"
+              :multiple-limit="headerItem?.tableForm.multipleLimit"
               :disabled="itemIsDisabled(headerItem, row)"
               :filterable="headerItem?.tableForm.filterable"
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+              @visible-change="visibleChange(headerItem.field, $event, row, $index)"
+            >
               <el-option
-                v-for="op in initSelectOptions(headerItem)" 
-                :label="t(`ts.${op.label}`).replace('ts.','')" 
-                :value="op.value"
-                :key="op.value" />
+                v-for="op in initSelectOptions(headerItem,row)"
+                :label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')"
+                :value="initValue(headerItem,op)"
+                :key="initValue(headerItem,op)"
+              />
             </el-select>
           </el-form-item>
           <!-- 下拉框 -->
           <el-form-item
             v-if="headerItem?.tableForm?.type == 'SelectGroup'"
-            :prop="headerItem.field">
-            <el-select :key="headerItem.field+$index"
+            :prop="headerItem.field"
+          >
+            <el-select
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="headerItem?.tableForm.clearable || true"
               :multiple="headerItem?.tableForm.multiple"
               :size="headerItem?.tableForm.size"
-              :collapse-tags ="headerItem?.tableForm.collapseTags" 
-              :collapse-tags-tooltip ="headerItem?.tableForm.collapseTagsTooltip" 
-              :multiple-limit ="headerItem?.tableForm.multipleLimit" 
+              :collapse-tags="headerItem?.tableForm.collapseTags"
+              :collapse-tags-tooltip="headerItem?.tableForm.collapseTagsTooltip"
+              :multiple-limit="headerItem?.tableForm.multipleLimit"
               :disabled="itemIsDisabled(headerItem, row)"
               :filterable="headerItem?.tableForm.filterable"
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%"
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)"
-              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
-               <el-option-group
-                  v-for="group in initSelectOptions(headerItem)"
-                  :key="group.type"
-                  :label="t(`ts.${group.name}`).replace('ts.','')"
-                >
-                  <el-option
-                    v-for="item in group.options"
-                    :key="item.value"
-                    :label="t(`ts.${item.label}`).replace('ts.','')"
-                    :value="item.value"
-                  />
-                </el-option-group>
+              @change="formSelectChange(headerItem.field, $event, row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
+            >
+              <el-option-group
+                v-for="group in initSelectOptions(headerItem,row)"
+                :key="group.type"
+                :label="t(`ts.${group.name}`).replace('ts.', '')"
+              >
+                <el-option
+                  v-for="item in group.options"
+                  :key="item.value"
+                  :label="t(`ts.${item.label}`).replace('ts.', '')"
+                  :value="item.value"
+                />
+              </el-option-group>
             </el-select>
           </el-form-item>
           <!-- 时间选择器 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormTime'" 
-            :prop="headerItem.field">
-            <el-time-picker :key="headerItem.field+$index"
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
+            <el-time-picker
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="true"
               :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
-              style="width: 100%" :disabled="itemIsDisabled(headerItem, row)"
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)"
               :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" />
+              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'"
+            />
           </el-form-item>
           <!-- 日期选择器 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'FormDate'" 
-            :prop="headerItem.field">
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
             <el-date-picker
-            :key="headerItem.field+$index" 
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="true"
               style="width: 100%"
@@ -189,14 +235,16 @@
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
-              @change="formFormDateChange(headerItem.field, $event,row, $index)" />
+              @change="formFormDateChange(headerItem.field, $event, row, $index)"
+            />
           </el-form-item>
           <!-- 日期时间选择器 -->
           <el-form-item
             v-if="headerItem?.tableForm?.type == 'FormDateTime'"
-            :prop="headerItem.field">
+            :prop="headerItem.field"
+          >
             <el-date-picker
-              :key="headerItem.field+$index"
+              :key="headerItem.field + $index"
               type="datetime"
               :clearable="true"
               v-model="row[headerItem.field]"
@@ -204,13 +252,16 @@
               style="width: 100%"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
-              :disabled="itemIsDisabled(headerItem, row)" />
+              :disabled="itemIsDisabled(headerItem, row)"
+            />
           </el-form-item>
           <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
           <el-form-item
             v-if="headerItem?.tableForm?.type == 'FormTimerange'"
-            :prop="headerItem.field">
-            <el-date-picker :key="headerItem.field+$index"
+            :prop="headerItem.field"
+          >
+            <el-date-picker
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :clearable="true"
               :disabled="itemIsDisabled(headerItem, row)"
@@ -219,13 +270,13 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" />
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
+            />
           </el-form-item>
           <!-- Switch 开关 -->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Switch'" 
-            :prop="headerItem.field">
-            <el-switch  :key="headerItem.field+$index"
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
+            <el-switch
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :disabled="itemIsDisabled(headerItem, row)"
               :loading="headerItem?.tableForm?.loading"
@@ -237,69 +288,79 @@
               :active-value="headerItem?.tableForm?.activeValue"
               :inactive-value="headerItem?.tableForm?.inactiveValue"
               :active-color="headerItem?.tableForm?.inactiveColor"
-              :inactive-color="headerItem?.tableForm?.inactiveColor" />
+              :inactive-color="headerItem?.tableForm?.inactiveColor"
+            />
           </el-form-item>
           <!-- Radio  单选-->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Radio'" 
-            :prop="headerItem.field">
-            <el-radio-group :key="headerItem.field+$index"
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
+            <el-radio-group
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :size="headerItem?.tableForm?.size"
               :disabled="itemIsDisabled(headerItem, row)"
               :text-color="headerItem?.tableForm?.textColor"
               :fill="headerItem?.tableForm?.fill"
               :name="headerItem?.tableForm?.name"
-              :id="headerItem?.tableForm?.id">
+              :id="headerItem?.tableForm?.id"
+            >
               <el-radio
-                v-for="(item, index) in initSelectOptions(headerItem)" 
+                v-for="(item, index) in initSelectOptions(headerItem,row)"
                 :key="index"
-                :label="t(`ts.${item.value}`).replace('ts.','')"
+                :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :size="headerItem?.tableForm?.size"
                 :disabled="itemIsDisabled(headerItem, row)"
-                :border="headerItem?.tableForm?.border">
+                :border="headerItem?.tableForm?.border"
+              >
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- Checkbox  多选-->
-          <el-form-item 
-            v-if="headerItem?.tableForm?.type == 'Checkbox'" 
-            :prop="headerItem.field">
-            <el-checkbox-group :key="headerItem.field+$index"
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
+            <el-checkbox-group
+              :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
               :disabled="itemIsDisabled(headerItem, row)"
               :size="headerItem?.tableForm?.size"
               :min="headerItem?.tableForm?.min"
               :max="headerItem?.tableForm?.max"
               :text-color="headerItem?.tableForm?.textColor"
-              :fill="headerItem?.tableForm?.fill">
+              :fill="headerItem?.tableForm?.fill"
+            >
               <el-checkbox
-                v-for="(item, index) in initSelectOptions(headerItem)" 
+                v-for="(item, index) in initSelectOptions(headerItem,row)"
                 :key="index"
-                :label="t(`ts.${item.value}`).replace('ts.','')"
+                :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :disabled="itemIsDisabled(headerItem, row)"
-                :true-label="t(`ts.${headerItem?.tableForm?.trueLabel}`).replace('ts.','')"
-                :false-label="t(`ts.${headerItem?.tableForm?.falseLabel}`).replace('ts.','')" 
+                :true-label="t(`ts.${headerItem?.tableForm?.trueLabel}`).replace('ts.', '')"
+                :false-label="t(`ts.${headerItem?.tableForm?.falseLabel}`).replace('ts.', '')"
                 :border="headerItem?.tableForm?.border"
                 :size="headerItem?.tableForm?.size"
                 :name="headerItem?.tableForm?.name"
-                :checked="headerItem?.tableForm?.checked">
+                :checked="headerItem?.tableForm?.checked"
+              >
                 {{ item.label }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <!-- table表添加操作列 -->
           <!-- <el-form-item> -->
-            <div v-if="headerItem?.tableForm?.type == 'action'" :key="headerItem.field+$index">
-              <el-button
-                v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
-                :key="indexButton"
-                type="text"
-                style="padding-top: 0px;align-items:unsafe;"
-                @click="buttonOperationClick(row, headerItem?.tableForm?.buttonName.split('|')[indexButton], $index)"
-              >{{itemButton}}</el-button>
-            </div>
+          <div v-if="headerItem?.tableForm?.type == 'action'" :key="headerItem.field + $index">
+            <el-button
+              v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
+              :key="indexButton"
+              type="text"
+              style="padding-top: 0px; align-items: unsafe"
+              @click.stop="
+                buttonOperationClick(
+                  row,
+                  headerItem?.tableForm?.buttonName.split('|')[indexButton],
+                  $index
+                )
+              "
+              >{{ itemButton }}</el-button
+            >
+          </div>
           <!-- </el-form-item> -->
         </el-form>
       </el-table-column>
@@ -312,26 +373,50 @@
         v-if="isShowReduceButtonSelection"
         v-slot="{ row, $index }"
       >
-        <ButtonBase :Butttondata="[defaultButtons.mainListDeleteBtn(),]" @button-base-click="handleDeleteTable (row, $index)" />
+        <ButtonBase
+          :Butttondata="[defaultButtons.mainListDeleteBtn()]"
+          @button-base-click="handleDeleteTable(row, $index)"
+        />
       </el-table-column>
     </el-table>
     <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
-    <el-pagination v-show="tableData.length>5" style="margin-top:10px"
-          v-model:current-page="currentPage"
-          v-model:page-size="pageSize"
-          :small="true"
-          :background="false"
-          layout="total, prev, pager, next, jumper"
-          :total="tableData.length"
-        />
-    <div class="button flex" v-if="isShowButton||isShowReduceButtonSelection">
-      <div class="p-12px" v-if="isShowButton" @click="handleAddTable">
-        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
-        <div>{{t('ts.添加明细')}}</div>
+    <el-pagination
+      v-show="tableData.length > 10"
+      style="margin-top: 10px"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :small="true"
+      :background="false"
+      layout="total, prev, pager, next, jumper"
+      :total="tableData.length"
+    />
+    <div class="button flex" v-if="isShowButton || isShowReduceButtonSelection">
+      <div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
+        <div>{{ t('ts.添加明细') }}</div>
       </div>
-      <div class="p-12px" v-if="isShowReduceButtonSelection" @click="handleSelectionDelete">
-        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" />
-        <div>{{t('ts.批量删除')}}</div>
+      <div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete">
+        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" />
+        <div>{{ t('ts.批量删除') }}</div>
+      </div>
+      <div
+        class="p-12px"
+        v-if="
+          routeName == 'PurchaseMain' ||
+          routeName == 'ProductionMain' ||
+          routeName == 'ZZBJDeliverPlanMain' ||
+          routeName == 'DeliverPlanMain' ||
+          routeName == 'DeliverRequestMain' ||
+          routeName == 'ZZBJDeliverRequestMain' ||
+          routeName == 'UnplannedreceiptRequestMain'||
+          routeName == 'RepleinshRequestMain'
+          
+        "
+      >
+        <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />
+        <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
+          t('批量添加')
+        }}</el-button>
       </div>
     </div>
   </div>
@@ -345,46 +430,46 @@ const props = defineProps({
   // 是否显示添加按钮
   isShowButton: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
   selectionTable: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示序号
   isShowIndex: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示删除按钮--多选
-  isShowReduceButtonSelection:{
+  isShowReduceButtonSelection: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 是否显示删除按钮
-  isShowReduceButton:{
+  isShowReduceButton: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 加载状态
   tableLoading: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 列表数据
   tableData: {
     type: Array,
     default: () => {
       return []
-    },
+    }
   },
   // 列表头定义
   tableFields: {
     type: Array,
     default: () => {
       return []
-    },
+    }
   },
   // table高度
   height: {
@@ -402,12 +487,18 @@ const props = defineProps({
   // 是否有边框（可拖拽）
   border: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // table输入表单的rules
   tableFormRules: {
     type: Object,
     default: null
+  },
+  // 业务名称
+  routeName: {
+    type: String,
+    required: false,
+    default: ''
   }
 })
 // 传递给父类
@@ -416,6 +507,7 @@ const emit = defineEmits([
   'tableSelectionDelete',
   'extendedButtonsClick',
   'formSelectChange',
+  'inputNumberChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
@@ -426,23 +518,29 @@ const emit = defineEmits([
   'inputStringBlur',
   'tableFormSelectOnBlur',
   'formFormDateChange',
-  'clearInput'
+  'clearInput',
+  'batchAdd',
+  'visibleChange'
 ])
 // 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (item) => {
-  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+const initSelectOptions = (headerItem,row) => {
+  if(row[headerItem.field+'InitOptions']){
+    return row[headerItem.field+'InitOptions']
+  }else{
+    return headerItem.dictType ? getStrDictOptions(headerItem.dictType) : headerItem.tableForm.initOptions
+  }
 }
 //普通下拉改变事件
-const formSelectChange = (field, val,row) => {
-  emit('formSelectChange', field, val,row)
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
 }
 // 日期改变事件
-const formFormDateChange = (field, val,row, index) => {
-  emit('formFormDateChange', field, val,row, index)
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
 }
 // 普通下拉失焦事件
-const tableFormSelectOnBlur = (field, val,row,index) => {
-  emit('tableFormSelectOnBlur', field, val,row,index)
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
 }
 // 数字输入-改变事件
 const inputNumberChange = (field, index, row, e) => {
@@ -454,18 +552,19 @@ const deleteTableData = ref([])
 
 // 点击selection框
 const tableSelectionChange = (val) => {
-  if(props.isShowReduceButtonSelection){
+  if (props.isShowReduceButtonSelection) {
     //勾选删除
     deleteTableData.value = val
-  }else{
+  } else {
     emit('tableSelectionChange', val)
   }
 }
-const handleSelectionDelete = ()=>{
+const handleSelectionDelete = () => {
   emit('tableSelectionDelete', deleteTableData.value)
-  nextTick(()=>{
-    deleteTableData.value.forEach(row=>{
-      TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+  TableBaseComponents_Ref.value.clearSelection()
+  nextTick(() => {
+    deleteTableData.value.forEach((row) => {
+      TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
     })
   })
 }
@@ -480,12 +579,25 @@ const tableSortChange = (column, prop, order) => {
 
 // 行点击
 const handleTableSelect = (row, column, event) => {
+  const selected = TableBaseComponents_Ref.value
+    ?.getSelectionRows()
+    .some((item) => item.id === row.id)
+  if (!selected) {
+    TableBaseComponents_Ref.value?.toggleRowSelection(row, true)
+  } else {
+    // 取消
+    TableBaseComponents_Ref.value?.toggleRowSelection(row, false)
+  }
   emit('handleTableSelect', row, column, event)
 }
 
 // 某个item是否禁用
 const itemIsDisabled = (colum, row) => {
-  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
+  return (
+    Boolean(colum.tableForm?.disabled) ||
+    Boolean(row.disabled) ||
+    Boolean(row['disabled_' + colum.field])
+  )
 }
 
 // const { t } = useI18n() // 国际化
@@ -495,25 +607,29 @@ const TableBaseComponents_Ref = ref()
 const TableBaseForm_Ref = ref()
 
 /**
-   * 验证表单是否符合rules
-   * @param {*} success 如果验证【成功】走的方法
-   * @param {*} error 如果验证【不成功】走的方法
-   */
+ * 验证表单是否符合rules
+ * @param {*} success 如果验证【成功】走的方法
+ * @param {*} error 如果验证【不成功】走的方法
+ */
 
 const validateForm = () => {
-  console.log(TableBaseForm_Ref.value)
-  let _lists = TableBaseForm_Ref.value?.map(v => v.validate())
-  return Promise.all(_lists).then(() => {
-    return true
-  }).catch(() => {
+  let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
+  if(!_lists ||_lists.length == 0){
     return false
-  })
+  }
+  return Promise.all(_lists)
+    .then(() => {
+      return true
+    })
+    .catch(() => {
+      return false
+    })
 }
 // 删除数据
 const handleDeleteTable = (row, index) => {
   emit('handleDeleteTable', row, index)
-  nextTick(()=>{
-    TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+  nextTick(() => {
+    TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
   })
 }
 // 添加数据
@@ -521,46 +637,94 @@ const handleAddTable = () => {
   emit('handleAddTable')
 }
 // 输入框聚焦
-const inpuFocus = (headerItem, row, index)=>{
-  if(headerItem?.tableForm?.isInpuFocusShow){
-   emit('inpuFocus', headerItem, row, index)
+const inpuFocus = (headerItem, row, index) => {
+  if (headerItem?.tableForm?.isInpuFocusShow) {
+    emit('inpuFocus', headerItem, row, index)
   }
 }
 
 // input输入失去焦点事件
-const inputStringBlur = (field, val,row) => {
-  emit('inputStringBlur', field, val,row)
+const inputStringBlur = (headerItem, val, row, index) => {
+  emit('inputStringBlur', headerItem, val, row, index)
 }
-const clearInput= (field, row, index) => {
-  emit('clearInput',field, row, index)
+const clearInput = (field, row, index) => {
+  emit('clearInput', field, row, index)
 }
 //点击table操作列按钮
-const buttonOperationClick = (row, label, index)=> {
-  emit("buttonOperationClick", row, label, index);
+const buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
 }
-
-const currentPage =ref(1)
+const visibleChange = (field, val, row, index) => {
+  emit('visibleChange',field, val, row, index)
+}
+const currentPage = ref(1)
 const pageSize = ref(10)
-const showTableData = ()=>{
-  console.log('props.tableData',props.tableData)
-  if(props.tableData.length>100){
-    return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value)
-  }else{
+const showTableData = () => {
+  if (props.tableData.length > 10) {
+    return props.tableData.slice(
+      (currentPage.value - 1) * pageSize.value,
+      currentPage.value * pageSize.value
+    )
+  } else {
     return props.tableData
   }
 }
+const keyWord = ref('')
+const batchAdd = () => {
+  let field = ''
+  const itemCodeFields = props.tableFields.find((item) => item.field == 'itemCode')
+  const supplierFields = props.tableFields.find((item) => item.field == 'supplierCode')
+  if (itemCodeFields) {
+    field = itemCodeFields.field
+  } else {
+    if (itemCodeFields) {
+      field = supplierFields.field
+    }
+  }
+  emit('batchAdd', keyWord.value)
+}
+const disabledInput = (headerItem, row) => {
+  if (headerItem.tableForm?.isInpuFocusShow) {
+    if (headerItem.tableForm?.enterSearch) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return (
+      headerItem?.tableForm?.disabled ||
+      Boolean(row.disabled) ||
+      Boolean(row['disabled_' + headerItem.field]) ||
+      false
+    )
+  }
+}
+const  initLabel=(headerItem,op)=>{
+if(headerItem?.tableForm?.labelField){
+  return op[headerItem?.tableForm?.labelField]
+}else{
+  return op.label
+}
+}
+const  initValue=(headerItem,op)=>{
+if(headerItem?.tableForm?.valueField){
+  return op[headerItem?.tableForm?.valueField]
+}else{
+  return op.value
+}
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
-  validateForm
+  validateForm,
+  keyWord
 })
-
 </script>
 
 
 <style scoped lang="scss">
-::v-deep(.el-table__body){
-  padding:10px 0px
+::v-deep(.el-table__body) {
+  padding: 10px 0px;
 }
 ::v-deep(.el-table--default .el-table__cell) {
   padding: 2px 0px;
@@ -583,20 +747,23 @@ defineExpose({
   display: block;
 }
 
+.table-form ::v-deep(.is-horizontal) {
+  height: 12px !important;
+  display: block !important;
+}
+
 .button {
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: center;
     cursor: pointer;
 
-    >div {
+    > div {
       margin-left: 6px;
       text-decoration: underline;
       color: #409eff;
     }
   }
-
-
 }
 </style>

src/components/Tabs/src/Tabs.vue

@@ -32,7 +32,13 @@ const change = (item, index) => {
   current.value = index
   emit('change',item,index)
 }
+
+const changeCurrent = (index) =>{
+  change(props.tabsList[index],index)
+}
 const emit = defineEmits(['change'])
+defineExpose({ changeCurrent}) 
+
 </script>
 
 

src/components/UploadFile/src/UploadFile.vue

@@ -80,7 +80,7 @@ const uploadHeaders = ref({
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
-    message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
+    message.error(`${t('ts.上传文件数量不能超过').replace('ts.','')}${props.limit}!`)
     return false
   }
   let fileExtension = ''

src/components/XButton/src/ButtonBase.vue

@@ -8,7 +8,7 @@
       :disabled="item.disabled"
       v-hasPermi="[item.hasPermi] || []"
       v-if="item.name != 'set'"
-      @click="buttonBaseClick(item.name, item, $event)"
+      @click.stop="buttonBaseClick(item.name, item, $event)"
     >
       <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>

src/directives/permission/clientTable.ts

@@ -13,7 +13,7 @@ export function clientTable(app: App<Element>) {
       if(el.children&&el.children.length>1){
         paginationHeight = 70
       }
-      const height = window.innerHeight - top - paginationHeight - qustionHeight 
+      const height = window.innerHeight - top - paginationHeight - qustionHeight +5
       el.style.height = height + 'px'
       el.firstChild.style.height = '100%'
     })

src/layout/components/CategoryHeader.vue

@@ -9,6 +9,8 @@ import { ElMenu, ElMenuItem } from 'element-plus'
 import { usePermissionStore } from '@/store/modules/permission'
 import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
 import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
+import ToolHeader from './ToolHeader.vue'
+
 // 头部工具
 import { useDesign } from '@/hooks/web/useDesign'
 const { getPrefixCls, variables } = useDesign()
@@ -101,6 +103,7 @@ export default defineComponent({
             }
         }}
       </ElMenu>
+      <ToolHeader class="tool-header"></ToolHeader>
       </div>
     )
   }
@@ -127,7 +130,11 @@ $prefix-cls: #{$namespace}-tool-header;
     left:0;
     z-index: 999;
   }
-
+  .tool-header{
+    position: absolute;
+    right: 0px;
+    top: 0px;
+  }
 }
 .categoryheader{
   padding-left: 20px;

src/layout/components/Message/src/Message.vue

@@ -62,7 +62,7 @@ onBeforeUnmount(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">

src/layout/components/ToolHeader.vue

@@ -54,30 +54,30 @@ export default defineComponent({
           'dark:bg-[var(--el-bg-color)]'
         ]}
       >
-        {layout.value !== 'top' ? (
+        {/* {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
             {hamburger.value && layout.value !== 'cutMenu' ? (
               <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
             ) : undefined}
             {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
           </div>
-        ) : undefined}
+        ) : undefined} */}
         <div class="h-full flex items-center">
           {search.value ? (<RouterSearch isModal={false} />) : undefined}
-          {screenfull.value ? (
+          {/* {screenfull.value ? (
             <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
-          ) : undefined}
-          {size.value ? (
+          ) : undefined} */}
+          {/* {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
-          ) : undefined}
-          {locale.value ? (
+          ) : undefined} */}
+          {/* {locale.value ? (
             <LocaleDropdown
               class="custom-hover"
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
-          ) : undefined}
+          ) : undefined} */}
           {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+            <Message class="custom-hover custom-hover1" color="var(--top-header-text-color)"></Message>
           ) : undefined}
           <UserInfo></UserInfo>
         </div>
@@ -93,4 +93,10 @@ $prefix-cls: #{$namespace}-tool-header;
 .#{$prefix-cls} {
   transition: left var(--transition-time-02);
 }
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.2;
+  transition: all 50ms;
+}
 </style>

src/layout/components/UserInfo/src/UserInfo.vue

@@ -6,6 +6,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import {  getTenantId } from '@/utils/auth'
 
 defineOptions({ name: 'UserInfo' })
 
@@ -28,6 +29,8 @@ const user = wsCache.get(CACHE_KEY.USER)
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
+const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+const tenant = names.find(item=>item.value == getTenantId())
 
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
@@ -51,18 +54,19 @@ const toDocument = () => {
 </script>
 
 <template>
-  <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
+  <ElDropdown class="custom-hover custom-hover1" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
-      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden">
-        {{ userName }}
-      </span>
+      <div class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden"  style="display: flex; flex-direction: column;color:#ffffff">
+        <span> {{ userName }} </span>
+        <span style="margin-top: 5px;text-align:center">{{ tenant.text }}</span>
+      </div>
     </div>
     <template #dropdown>
       <ElDropdownMenu>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
-          <div @click="toProfile">{{ t('common.profile') }}</div>
+          <div @click="toProfile" >{{ t('common.profile') }}</div>
         </ElDropdownItem>
         <!-- <ElDropdownItem>
           <Icon icon="ep:menu" />
@@ -76,3 +80,13 @@ const toDocument = () => {
     </template>
   </ElDropdown>
 </template>
+
+<style lang="scss" scoped>
+
+.custom-hover1:hover{
+  opacity: 0.5;
+  background-color: transparent;
+  scale: 1.1;
+  transition: all 50ms;
+}
+</style>

src/layout/components/useRenderLayout.tsx

@@ -39,7 +39,7 @@ const fixedMenu = computed(() => appStore.getFixedMenu)
 // 搜索图片
 const search = computed(() => appStore.search)
 const scrollBarHeight = computed(() => {
-  return (window.innerHeight - appStore.getCategoryMenuHeight - 85)+'px'
+  return (window.innerHeight - appStore.getCategoryMenuHeight - 35)+'px'
 })
 
 export const useRenderLayout = () => {
@@ -114,14 +114,14 @@ export const useRenderLayout = () => {
             style="transition: all var(--transition-time-02);width:100%;"
           >
             
-            <ToolHeader
+            {/* <ToolHeader
               class={[
                 'bg-[var(--top-header-bg-color)]',
                 {
                   'layout-border__bottom': !tagsView.value
                 }
               ]}
-            ></ToolHeader>
+            ></ToolHeader> */}
 
             {tagsView.value ? (
               <TagsView class="layout-border__bottom layout-border__top"></TagsView>

src/locales/en-US.ts

@@ -884,6 +884,7 @@ export default {
     共:'Total',
     打开:'Open',
     保存:'Save',
+    下一步:'Next',
     请选择筛选对象:'Please select filter',
     请输入内容:'Please inputr content',
     附件:'Attachment',
@@ -1137,7 +1138,22 @@ export default {
     '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words',
     批量发布:'Batch release',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
-    '确 认':'Confirm'
+    '确 认':'Confirm',
+    请输入拒收原因:'Please enter the reason for rejection',
+    查看明细:'View details',
+    全部已读:'All read',
+    '申请发货数量不能大于 计划数量 - 已发货数量':'The requested quantity cannot be greater than the planned quantity - the quantity shipped',
+    不允许超发:'Oversend is not allowed',
+    总数量超出计划数量:'The total quantity exceeds the planned quantity',
+    导出二维表:'Exporting two-dimensional tables',
+    要货计划明细:'Detailed requisition plan',
+    要货计划二维表:'Two dimensional requisition schedule',
+    '要货预测-计划员':'Demand forecast-Planner',
+    '要货预测-供应商':'Demand forecast-Supplier',
+    全选:'All',
+    计划员:'Planner',
+
+
   },
   
 

src/locales/zh-CN.ts

@@ -884,6 +884,7 @@ export default {
     共:'共',
     打开:'打开',
     保存:'保存',
+    下一步:'下一步',
     请选择筛选对象:'请选择筛选对象',
     请输入内容:'请输入内容',
     附件:'附件',
@@ -1138,6 +1139,20 @@ export default {
     批量发布:'批量发布',
     '重新生成标签会删除上次生成的标签，是否确认继续？':'重新生成标签会删除上次生成的标签，是否确认继续？',
     '确 认':'确 认',
+    请输入拒收原因:'请输入拒收原因',
+    查看明细:'查看明细',
+    全部已读:'全部已读',
+    '申请发货数量不能大于 计划数量 - 已发货数量':'申请发货数量不能大于 计划数量 - 已发货数量',
+    不允许超发:'不允许超发',
+    总数量超出计划数量:'总数量超出计划数量',
+    导出二维表:'导出二维表',
+    要货计划明细:'要货计划明细',
+    要货计划二维表:'要货计划二维表',
+    '要货预测-计划员':'要货预测-计划员',
+    '要货预测-供应商':'要货预测-供应商',
+    全选:'全选',
+    计划员:'计划员',
+
   },
 
 }

src/main.ts

@@ -45,6 +45,9 @@ import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐
 import DataVVue3 from '@kjgl77/datav-vue3'
 import { useLocaleStore } from '@/store/modules/locale'
 
+import { vue_next_focus } from "vue-next-focus";
+
+
 // 创建实例
 const setupAll = async () => {
   const app = createApp(App)
@@ -67,6 +70,7 @@ const setupAll = async () => {
 
   app.use(VueDOMPurifyHTML)
   app.use(DataVVue3)
+  app.use( vue_next_focus )
 
   app.mount('#app')
   app.config.warnHandler = () => null;

src/store/modules/permission.ts

@@ -4,6 +4,7 @@ import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { flatMultiLevelRoutes, generateRoute } from '@/utils/routerHelper'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {  getTenantId } from '@/utils/auth'
 
 const { wsCache } = useCache()
 
@@ -33,11 +34,19 @@ export const usePermissionStore = defineStore('permission', {
   actions: {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
+        // let names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+        // let tenant = names.find(item=>item.value == getTenantId())
         // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取
         let res: AppCustomRouteRecordRaw[] = []
         if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
           res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+          // res.forEach(item=>{
+          //   if(item.name == '富维海拉供应商系统'&&tenant){
+          //     item.name = item.name + tenant['text']
+          //   }
+          // })
         }
+        console.log('菜单res',res)
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面
         this.addRouters = routerMap.concat([

src/utils/calculate.ts

@@ -0,0 +1,105 @@
+
+  // 判断传入的值-是否为整数
+  function isInteger(obj) {
+    return Math.floor(obj) === obj
+  }
+
+  // 将一个浮点数转成整数，返回整数和倍数。如 3.14 >> 314，倍数是 100
+  // @param floatNum { number } 小数
+  // @return { object }
+  // { times: 100, num: 314 }
+
+  // 用于返回整数和倍数
+  function toInteger(floatNum) {
+    // 声明一个对象用来保存倍数和整数
+    const ret = { times: 1, num: 0 }
+    // 第一种情况：是整数
+    if (isInteger(floatNum)) {
+      // 把整数给 ret中的   num
+      ret.num = floatNum
+      return ret //  最后返回 ret
+    }
+
+    // 第二种情况-不是整数，
+    const strfi = floatNum + ''  // 转为字符串  "0.1"
+    const dotPos = strfi.indexOf('.')  // 查询小数点
+    const len = strfi.substr(dotPos + 1).length; //  获取小数点后的长度
+    const times = Math.pow(10, len)  // 放大多少倍
+    const intNum = Number(floatNum.toString().replace('.', ''))  // 返回 转为字符串  截取掉小数点  最后转为数字（整数）
+    // 把获取到的倍数和整数存入对象中
+    ret.times = times
+    ret.num = intNum
+    return ret
+  }
+
+
+  // 核心方法，实现加减乘除运算，确保不丢失精度
+  // 思路：把小数放大为整数（乘），进行算术运算，再缩小为小数（除）
+  // @param a { number } 运算数1
+  // @param b { number } 运算数2
+  // @param digits { number } 精度，保留的小数点数，比如 2, 即保留为两位小数
+  // @param op { string } 运算类型，有加减乘除（add / subtract / multiply / divide）
+
+
+
+  function operation(a, b, digits, op) {
+    // 获取倍数和整数的对象
+    const o1 = toInteger(a)
+    const o2 = toInteger(b)
+    // 提取整数
+    const n1 = o1.num
+    const n2 = o2.num
+    // 提取倍数
+    const t1 = o1.times
+    const t2 = o2.times
+
+    // 获取最大倍数
+    const max = t1 > t2 ? t1 : t2
+    let result = 0  //
+
+    switch (op) {
+      case 'add':
+        if (t1 === t2) { // 两个小数位数相同
+          result = n1 + n2    //  
+        } else if (t1 > t2) { // o1 小数位 大于 o2
+          result = n1 + n2 * (t1 / t2)
+        } else { // o1 小数位 小于 o2
+          result = n1 * (t2 / t1) + n2
+        }
+        return result / max
+      case 'subtract':
+        if (t1 === t2) {
+          result = n1 - n2
+        } else if (t1 > t2) {
+          result = n1 - n2 * (t1 / t2)
+        } else {
+          result = n1 * (t2 / t1) - n2
+        }
+        return result / max
+      case 'multiply':
+        result = (n1 * n2) / (t1 * t2)
+        return result
+      case 'divide':
+        result = (n1 / n2) * (t2 / t1)
+        return result
+    }
+  }
+
+  // 加减乘除的四个接口
+export function add(a, b, digits) {
+    return operation(a, b, digits, 'add')
+  }
+export function subtract(a, b, digits) {
+    return operation(a, b, digits, 'subtract')
+  }
+export function multiply(a, b, digits) {
+    return operation(a, b, digits, 'multiply')
+  }
+export function divide(a, b, digits) {
+    return operation(a, b, digits, 'divide')
+  }
+
+
+
+// console.log(floatObj.add(0.5, 0.2))
+// console.log(floatObj.add(0.12, 0.3))

src/utils/dict.ts

@@ -188,6 +188,7 @@ export enum DICT_TYPE {
   UOM = 'uom', // 计量单位
   ABC_CLASS = 'abc_class', // ABC类
   TRUE_FALSE = 'true_false', // 是否
+  ALLOWOVERSHIPMENT = 'allow_over_shipment',//是否允许超发
   FALSE_OR_TRUE = 'false_or_true', // 是否2
   ITEM_GROUP = 'item_group', // 物料分组
   ITEM_CATEGORY = 'Item_category', // 物料种类
@@ -224,11 +225,14 @@ export enum DICT_TYPE {
   REQEUST_MODE = 'reqeust_mode', // 申请模式
   TIME_UNIT = 'time_unit', // 时间单位
   COUNT_TYPE = 'count_type', // 盘点类型
+  COUNT_SPLIT_TYPE = 'count_split_type', // 盘点拆分方式
   COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型
   BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
   SETTLEMENT_TYPE = 'settlement_type', // 结算类型
   FROZEN_REASON = 'frozen_reason', // 冻结原因
   INVENTORY_ACTION = 'inventory_action', // 库存动作
+  EAM_INVENTORY_ACTION = 'EAM_inventory_action', // EAM库存动作
+  EAM_TRANSACTION_TYPE = 'EAM_transaction_Type', // EAM库存类型
   CONTAINER_TYPE = 'container_type', // 器具类型
   CONTAINER_CONTENT_TYPE = 'container_content_type', // 器具内容类型
   RESET_PERIOD = 'reset_period', // 重置周期
@@ -282,6 +286,8 @@ export enum DICT_TYPE {
   DELIVER_TYPE = 'deliver_type', //发货类型
   BILL_TYPE = 'bill_type', // 发票类型
   CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型
+  INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差
+  PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态
@@ -354,6 +360,7 @@ export enum DICT_TYPE {
   REPAIR_DEGREE = 'repair_degree', //维修紧急程度
   REPAIR_LEVEL = 'repair_level', //维修级别
   IS_COMPLETED = 'is_completed', //是否完成
+  IS_NORMAL = 'is_normal', //正常异常
   MAINTENANCE_CYCLE = 'maintenance_cycle', // 保养周期
   INSPECTION_CYCLE = 'inspection_cycle', // 巡检周期
   SPOTCHECK_CYCLE = 'spotcheck_cycle', // 巡检周期
@@ -374,5 +381,6 @@ export enum DICT_TYPE {
   SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum', // 流程状态
   EAM_OUT_STATUS = 'eam_out_status', // 出库状态
   IS_LINE_ITEM = 'is_line_item', // 是否是线边
-  PUT_IN_TYPE = 'put_in_type' // 入库类型
+  PUT_IN_TYPE = 'put_in_type', // 入库类型
+  PURCHASE_JOB_STATUS = 'purchase_job_status', // 采购收货任务状态
 }

src/utils/disposition/tabsList.ts

@@ -38,3 +38,9 @@ export const PurchasereceiptRequestTabsList = [{
   }
 ]
 
+export const PurchasereceiptRefuseRequestTabsList = [{
+  label: "拒收明细",
+  prop: 'receiptDetail',
+}
+]
+