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

src/api/eam/equipmentRepairJobDetail/index.ts

@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface EquipmentRepairJobDetailVO {
+  id: number
+  number: string
+  masterId: number
+  describing: string
+  faultCause: string
+  workOut: string
+  maintenances: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询维修工单子列表
+export const getEquipmentRepairJobDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/equipment-repair-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/equipment-repair-job-detail/page`, params })
+  }
+}
+
+// 查询维修工单子详情
+export const getEquipmentRepairJobDetail = async (id: number) => {
+  return await request.get({ url: `/eam/equipment-repair-job-detail/get?id=` + id })
+}
+
+// 新增维修工单子
+export const createEquipmentRepairJobDetail = async (data: EquipmentRepairJobDetailVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-detail/create`, data })
+}
+
+// 修改维修工单子
+export const updateEquipmentRepairJobDetail = async (data: EquipmentRepairJobDetailVO) => {
+  return await request.put({ url: `/eam/equipment-repair-job-detail/update`, data })
+}
+
+// 删除维修工单子
+export const deleteEquipmentRepairJobDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/equipment-repair-job-detail/delete?id=` + id })
+}
+
+// 导出维修工单子 Excel
+export const exportEquipmentRepairJobDetail = async (params) => {
+  return await request.download({ url: `/eam/equipment-repair-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/equipment-repair-job-detail/get-import-template' })
+}

src/api/eam/equipmentRepairJobMain/index.ts

@@ -0,0 +1,93 @@
+import request from '@/config/axios'
+import {EquipmentReportRepairRequestVO} from "@/api/eam/equipmentReportRepairRequest";
+
+export interface EquipmentRepairJobMainVO {
+  id: number
+  number: string
+  type: string
+  repairNumber: string
+  sources: string
+  maintenanceDesc: string
+  urgency: string
+  level: string
+  equipmentCode: string
+  shutDown: boolean
+  startTime: Date
+  endTime: Date
+  totalMinutes: number
+  verifyer: number
+  verifyContent: string
+  verifyTime: Date
+  maintenancer: number
+  maintenancePhone: string
+  completeResult: string
+  completionTime: Date
+  maintenanceTime: Date
+  repairTime: Date
+  repairer: number
+  faultType: string
+  status: string
+  autoOrder: string
+  autoPerform: string
+  autoVerify: string
+  directCreateRecord: string
+  classType: string
+  factoryAreaCode: string
+  workshopCode: string
+  lineCode: string
+  processCode: string
+  workstationCode: string
+  departmentCode: string
+  remark: string
+  siteId: string
+  available: string
+  deletionTime: Date
+  deleterId: byte[]
+  concurrencyStamp: number
+}
+
+// 查询维修工单主列表
+export const getEquipmentRepairJobMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/equipment-repair-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/equipment-repair-job-main/page`, params })
+  }
+}
+
+// 查询维修工单主详情
+export const getEquipmentRepairJobMain = async (id: number) => {
+  return await request.get({ url: `/eam/equipment-repair-job-main/get?id=` + id })
+}
+
+// 新增维修工单主
+export const createEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/create`, data })
+}
+
+// 修改维修工单主
+export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => {
+  return await request.put({ url: `/eam/equipment-repair-job-main/update`, data })
+}
+
+// 删除维修工单主
+export const deleteEquipmentRepairJobMain = async (id: number) => {
+  return await request.delete({ url: `/eam/equipment-repair-job-main/delete?id=` + id })
+}
+
+// 导出维修工单主 Excel
+export const exportEquipmentRepairJobMain = async (params) => {
+  return await request.download({ url: `/eam/equipment-repair-job-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/equipment-repair-job-main/get-import-template' })
+}
+
+// 修改维修工单状态
+export const updateEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) => {
+  return await request.post({ url: `/eam/equipment-repair-job-main/updateOrder`, data  })
+}

src/api/eam/equipmentReportRepairRequest/index.ts

@@ -70,4 +70,14 @@ export const exportEquipmentReportRepairRequest = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/eam/equipment-report-repair-request/get-import-template' })
-}
+}
+
+// 修改报修工单状态
+export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepairRequestVO) => {
+  return await request.post({ url: `/eam/equipment-report-repair-request/updateOrder`, data  })
+}
+
+// 完成并创建维修工单
+export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => {
+  return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data  })
+}

src/api/home/index.ts

@@ -20,3 +20,40 @@ export const getProductData = async () => {
   return await request.get({ url: `/wms/index/indexProduct` })
 }
 
+// 超期库存预警
+export const getOverdueBalance = async (params) => {
+  return await request.get({ url: `/wms/index/pageOverdueBalance`,params })
+}
+
+// 呆滞库存预警
+export const getStagnantBalance = async (params) => {
+  return await request.get({ url: `/wms/index/pageStagnantBalance` ,params})
+}
+// 高低储预警
+export const getWarningBalance = async (params) => {
+  return await request.get({ url: `/wms/index/pageWarningBalance` ,params})
+}
+
+// 本月退货明细
+export const getPurchasereturnRecordMonth = async (params) => {
+  return await request.get({ url: `/wms/index/pagePurchasereturnRecordMonth`,params })
+}
+
+// 本月索赔明细
+export const getPurchaseclaimRecordMonth = async (params) => {
+  return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params })
+}
+
+// 今日生产计划
+export const getProductionToday = async (params) => {
+  return await request.get({ url: `/wms/index/pageProductionToday`,params })
+}
+
+// 线边安全库存
+export const getSafeLocation = async (params) => {
+  return await request.get({ url: `/wms/index/pageSafeLocation`,params })
+}
+// 待上架成品库存
+export const getProductputawayJobDetail = async (params) => {
+  return await request.get({ url: `/wms/index/pageProductputawayJobDetail`,params })
+}

src/api/wms/inventoryinitRecordDetail/index.ts

@@ -72,4 +72,9 @@ export const exportInventoryinitRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' })
+}
+
+// 批量打印
+export const printLabelBatchByIdSelection = async (data: any) => {
+  return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data})
 }

src/api/wms/productreceiptRequestMain/index.ts

@@ -137,4 +137,10 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id })
+}
+
+
+// 创建标签
+export const productCreateLabel = async (data: ProductreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/productreceipt-request-main/productCreateLabel`, data })
 }

src/api/wms/qadproductionplan/index.ts

@@ -26,6 +26,17 @@ export const getQadProductionPlanMainPage = async (params) => {
     return await request.get({ url: `/wms/qad-production-plan-main/page`, params })
   }
 }
+export const getQadProductionPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/qad-production-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/qad-production-plan-detail/page`, params })
+  }
+}
+
+
 
 // 查询QAD生产计划主详情
 export const getQadProductionPlanMain = async (id: number) => {

src/api/wms/unplannedissueRecordDetail/index.ts

@@ -38,6 +38,9 @@ export const getUnplannedissueRecordDetailPage = async (params) => {
       'action':'==',
       'value':'1'
     }
+    if(!data.filters){
+      data.filters = []
+    }
     data.filters.push(dataTypeCondition)
     return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data })
   } else {

src/api/wms/unplannedissueRequestDetail/index.ts

@@ -33,6 +33,9 @@ export const getUnplannedissueRequestDetailPage = async (params) => {
       'action':'==',
       'value':'1'
     }
+    if(!data.filters){
+      data.filters = [];
+    }
     data.filters.push(dataTypeCondition)
     return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data })
   } else {

src/components/BasicForm/src/BasicForm.vue

@@ -130,6 +130,7 @@ 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'
 
 const props = defineProps({
   // 显示窗口宽度设置
@@ -565,7 +566,9 @@ const buttonBaseClick = (val) => {
   } 
    // 保存
   else if (val == 'save') {
-    submitForm()
+    debounce(() => {
+      submitForm()
+    }, 2000)()
   }
   // 关闭
   else if (val == 'close') {

src/components/SearchTable/src/SearchTable.vue

@@ -10,6 +10,7 @@
       :HeadButttondata="HeadButttondata"
       :routeName="routeName"
       @searchFormClick="searchFormClick"
+      @buttonBaseClick="buttonBaseClick"
       :allSchemas="allSchemasRef"
     />
     <ContentWrap>
@@ -26,6 +27,7 @@
         v-model:sort="tableObjectRef.sort"
         :searchTableSelectionsList="searchTableSelectionsList"
         :selection="true"
+        :selectionTotal="multipleBol"
         :reserveSelection="true"
         row-key="id"
       />
@@ -53,10 +55,18 @@ routeName.value = route.name
 const searchDialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const multipleBol = ref(false)
+
 
 // 列表头部按钮
-const HeadButttondata = ref([
+const HeadButttondata = ref(multipleBol.value?
+[
+  defaultButtons.defaultWhenPageBtn(null), // 选择当页
+  defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+  // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
   defaultButtons.defaultFilterBtn(null), // 筛选
+]:[
+  defaultButtons.defaultFilterBtn(null) // 筛选
 ])
 
 /** 打开弹窗 */
@@ -71,28 +81,39 @@ const searchFieldRef = ref()
 const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
-const multipleBol = ref(false)
 const searchConditionRef = ref()
 const searchTableSelectionsList = ref()//表格弹窗回显的列表
 
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
   dialogWidth.value = '80%'
-  HeadButttondata.value = [
+  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.','')
   tableObjectRef.value = tableObject
   searchDialogVisible.value = true
-  multipleBol.value = multiple
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
 }
 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) => {
   dialogWidth.value = '80%'
-  HeadButttondata.value = [
+  multipleBol.value = multiple
+  HeadButttondata.value = multiple?[
+    defaultButtons.defaultWhenPageBtn(null), // 选择当页
+    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
     defaultButtons.defaultFilterBtn(null), // 筛选
-  ] 
+  ]:
+  [
+    defaultButtons.defaultFilterBtn(null), // 筛选
+  ]
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
@@ -108,7 +129,6 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   getPage.value = getApiPage
   typeRef.value = type
   rowRef.value = row
-  multipleBol.value = multiple
   // dialogTitle.value = t('action.' + type)
   dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
   searchTableSelectionsList.value = searchTableSelections
@@ -175,6 +195,20 @@ const searchFormClick = (searchData) => {
   }
   getListRef.value() // 刷新当前列表
 }
+const buttonBaseClick = (val, item) => {
+  // 设置按钮 
+  if (val == 'DeselectAll') {
+    // 取消全选
+    searchTableRef.value.clearSelection()
+  } else if (val == 'UnselectPage') {
+    // 反选当页
+    searchTableRef.value.togglePageSelection()
+  } else if (val == 'WhenPage') {
+    // 选择当页
+    searchTableRef.value.toggleAllSelection(true)
+  }
+}
+
 
 defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
 

src/components/Table/src/Table.vue

@@ -21,6 +21,8 @@ export default defineComponent({
     currentPage: propTypes.number.def(1),
     // 是否多选
     selection: propTypes.bool.def(false),
+    // 是否显示多选数量
+    selectionTotal: propTypes.bool.def(false),
     // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
     showOverflowTooltip: propTypes.bool.def(true),
     // 表头
@@ -115,12 +117,36 @@ export default defineComponent({
 
     const selections = ref<Recordable[]>([])
     const sortRef = ref()
+    // 选中某行
     const selectRow  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
-    const selectAll  = (val)=>{
+    //全选回调
+    const selectAll  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
+    //反选
+    const togglePageSelection = ()=>{
+      unref(getProps).data.forEach(row=>{
+        elTableRef.value!.toggleRowSelection(row)
+      })
+    }
+    // 切换全选/不全选
+    const toggleAllSelection = (isAll)=>{
+      if(isAll){
+        //全选
+        if(elTableRef.value?.getSelectionRows().length<unref(getProps).data.length){
+          elTableRef.value!.toggleAllSelection()
+        }
+      }
+    }
+    
+    //清空选择
+    const clearSelection  = ()=>{
+      console.log('clearSelection')
+      elTableRef.value!.clearSelection()
+    }
+    
     const selectionChange = (selection: Recordable[]) => {
       selections.value = selection
     }
@@ -134,7 +160,11 @@ export default defineComponent({
       setProps,
       setColumn,
       selections,
-      toggleRowSelection
+      toggleRowSelection,
+      selectAll,
+      toggleAllSelection,
+      togglePageSelection,
+      clearSelection
     })
 
     const pagination = computed(() => {
@@ -358,13 +388,15 @@ export default defineComponent({
             append: () => getSlot(slots, 'append')
           }}
         </ElTable>
-        
+        {unref(getProps).selectionTotal ? (
+          <div class="mt-5px">已选{selections.value.length}条数据</div>
+        ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
             <ElPagination
               v-model:pageSize={pageSizeRef.value}
               v-model:currentPage={currentPageRef.value}
-              class="float-right mb-15px mt-15px"
+              class="float-right mt-15px"
               {...unref(pagination)}
             ></ElPagination>         
         ) : undefined}

src/config/axios/config.ts

@@ -16,7 +16,7 @@ const config: {
   /**
    * 接口请求超时时间
    */
-  request_timeout: 30000,
+  request_timeout: 300000,
 
   /**
    * 默认接口请求类型

src/layout/components/Menu/src/components/useRenderMenuTitle.tsx

@@ -9,7 +9,8 @@ export const useRenderMenuTitle = () => {
     return icon ? (
       <>
         <Icon icon={meta.icon}></Icon>
-        <span class="v-menu__title ellipsis">{t(`ts.${title}` as string).replace('ts.','')}</span>
+        {/* ellipsis */}
+        <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>
       </>
     ) : (
       <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>

src/locales/en-US.ts

@@ -864,6 +864,9 @@ export default {
     导出:'Export',
     刷新:'Refresh',
     筛选:'Filter',
+    选择当页:'As Page',
+    反选当页:'Unselect Page',
+    取消全选:'Deselect All',
     设置:'Settings',
     确定:'Confirm',
     '确 定':'Confirm',
@@ -1119,6 +1122,11 @@ export default {
     忘记密码:'Forget  Password',
     用户名:'User Name',
     邮箱:'Mail',
+    今日:'Today',
+    请输入驳回原因:'Please enter the reason for rejection',
+    '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words',
+    批量发布:'Batch release'
+
   },
   
 

src/locales/zh-CN.ts

@@ -864,6 +864,9 @@ export default {
     导出:'导出',
     刷新:'刷新',
     筛选:'筛选',
+    选择当页:'选择当页',
+    反选当页:'反选当页',
+    取消全选:'取消全选',
     设置:'设置',
     确定:'确定',
     '确 定':'确 定',
@@ -1119,7 +1122,10 @@ export default {
     忘记密码:'忘记密码',
     用户名:'用户名',
     邮箱:'邮箱',
-
+    今日:'今日',
+    请输入驳回原因:'请输入驳回原因',
+    '驳回原因不能为空，且不超过60字':'驳回原因不能为空，且不超过60字',
+    批量发布:'批量发布'
 
 
   },

src/utils/dict.ts

@@ -354,7 +354,12 @@ export enum DICT_TYPE {
   REPAIR_LEVEL = 'repair_level', //维修级别
   IS_COMPLETED = 'is_completed', //是否完成
   MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期
-  EAM_ORDER_STATUS = 'eam_order_status',
+  EAM_ORDER_STATUS = 'eam_order_status',// 保养工单状态
-  EAM_PLAN_STATUS = 'eam_plan_status',
+  EAM_PLAN_STATUS = 'eam_plan_status', // 保养计划状态
+  EAM_REPAIR_REPORT_STATUS = 'eam_repair_report_status', // 报修状态
+  EAM_MAINTENANCE_SOURCES = 'eam_maintenance_sources', // 维保数据来源
+  EAM_MAINTENANCE_URGENCY = 'eam_maintenance_urgency', // 维保紧急程度
+  EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别
+  EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态
   OFF_BACK_STATUS = 'off_back_status'
 }

src/utils/disposition/defaultButtons.ts

@@ -159,7 +159,45 @@ export function defaultSearchResetBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 选择当页
+export function defaultWhenPageBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.选择当页`).replace('ts.', ''),
+    name: 'WhenPage',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 反选当页
+export function defaultUnselectPageBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.反选当页`).replace('ts.', ''),
+    name: 'UnselectPage',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 取消全选
+export function defaultDeselectAllBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.取消全选`).replace('ts.', ''),
+    name: 'DeselectAll',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // form表单-保存按钮
 export function formSaveBtn(option:any) {
   return __defaultBtnOption(option,{
@@ -390,6 +428,32 @@ export function mainListAuditingBtn(option:any) {
   })
 }
 
+// 主列表-审核完成按钮
+export function mainListAuditedBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.审核完成`).replace('ts.', ''),
+    name: 'audited',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
+// 主列表-撤回按钮
+export function mainListRevokeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.撤回`).replace('ts.', ''),
+    name: 'revoke',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-绑定
 export function mainListBindBtn(option:any) {
   return __defaultBtnOption(option,{
@@ -492,7 +556,19 @@ export function mainListOrderPubBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 主列表-订单流程-批量发布按钮
+export function mainListSelectionOrderPubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.批量发布`).replace('ts.', ''),
+    name: 'mainOrderSelectionPub',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'left',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-订单流程-关闭按钮
 export function mainListOrderCloBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/eam/basicFaultCause/basicFaultCause.data.ts

@@ -31,7 +31,7 @@ export const BasicFaultCause = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '设备编码',
+    label: '编码',
     field: 'code',
     sort: 'custom',
     isSearch: true,

src/views/eam/basicFaultType/basicFaultType.data.ts

@@ -18,7 +18,7 @@ export const BasicFaultType = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail:false,
   },
   {
-    label: '设备编码',
+    label: '编码',
     field: 'code',
     sort: 'custom',
     isSearch: true,

src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts

@@ -89,6 +89,8 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '故障类型枚举',
     field: 'faultType',
     sort: 'custom',
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string',
     isSearch: true,
     isSearch: false,
   },

src/views/eam/equipmentMaintenanceMain/index.vue

@@ -353,39 +353,6 @@ const handleFinish = async (row) => {
 
   //打开提交表单
   finishForm2Ref.value.open('update', row);
-
-  //let  res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig();
-  //系统配置需要验证
-  // if(res.remark === 'TRUE'){
-  //   try {
-  //
-  //
-  //       // // 二次确认
-  //       // await message.delConfirm('是否完成所选中工单？');
-  //       // const params = ref({
-  //       //   id: '',
-  //       //   status:'',
-  //       // })
-  //       // params.value.id = row.id
-  //       // params.value.status = '5'
-  //       // // 发起
-  //       // await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
-  //       // message.success(t('工单已完成'))
-  //       // // 刷新列表
-  //       // await getList()
-  //   } catch {}
-  // }
-  // //系统配置不需要验证
-  // if(res.remark === 'FALSE'){
-  //   try {
-  //     // 二次确认
-  //     await message.delConfirm('是否完成所选中工单？');
-  //
-  //     //打开提交表单
-  //     finishForm2Ref.value.open('update', row);
-  //
-  //   } catch {}
-  // }
 }
 
 /** 验证按钮操作 */
@@ -406,8 +373,6 @@ const handleValidate = async (row) => {
     await getList()
   })
 
-
-
 }
 
 /** 启用 */

src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts

@@ -4,138 +4,229 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const EquipmentMaintenanceRecordMainRules = reactive({
   number: [required],
+  sources: [required],
   equipmentCode: [required],
-  planNumber: [required],
+  type: [required],
-  status: [required],
+  planStartTime: [required],
-  factoryAreaCode: [required],
+  planEndTime: [required],
-  concurrencyStamp: [required]
+  startTime: [required],
+  endTime: [required],
 })
 
 export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '保养编号',
+    label: 'id',
-    field: 'number',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '记录编号',
+    field: 'recordNo',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
   },
   {
     label: '描述',
     field: 'describing',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isSearch: false,
+  },
+  {
+    label: '保养工单',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '来源字典',
+    field: 'sources',
+    sort: 'custom',
+    isSearch: true,
+    isSearch: false,
   },
   {
     label: '设备编号',
     field: 'equipmentCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
   },
   {
-    label: '设备类别',
+    label: '故障类型枚举',
-    field: 'category',
+    field: 'faultType',
     sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    form: {
+    isSearch: false,
-      component: 'SelectV2'
+
-    }
   },
   {
-    label: '班次枚举',
+    label: '工装或设备字典',
-    field: 'classes',
+    field: 'type',
     sort: 'custom',
-    // dictType: DICT_TYPE.SHIFT_TYPE,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string',
   },
   {
-    label: '保养计划工单',
+    label: '保养计划工单号',
     field: 'planNumber',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
   },
   {
-    label: '故障类型枚举',
+    label: '计划开始时间',
-    field: 'faultType',
+    field: 'planStartTime',
     sort: 'custom',
-    dictType: DICT_TYPE.FAILURE_REASON,
+    formatter: dateFormatter,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
-    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
     form: {
-      component: 'SelectV2'
+      component: 'DatePicker',
-    }
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '保养周期',
+    label: '计划结束时间',
-    field: 'cycle',
+    field: 'planEndTime',
     sort: 'custom',
-      dictType: DICT_TYPE.MAINTENANCE_CYCLE,
+    formatter: dateFormatter,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
-    isSearch: true
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '保养次数',
+    label: '保养开始时间',
-    field: 'times',
+    field: 'startTime',
     sort: 'custom',
-    isSearch: true
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '验证人',
+    label: '保养结束时间',
-    field: 'verifyer2',
+    field: 'endTime',
     sort: 'custom',
-    isSearch: true,
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
     form: {
-      component: 'InputNumber',
+      component: 'DatePicker',
-      value: 0
+      componentProps: {
-    }
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '验证内容',
+    label: '保养班组',
-    field: 'verifyContent2',
+    field: 'classType',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
-    label: '验证时间',
+    label: '验证人',
-    field: 'verifyTime2',
+    field: 'verifyer',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
-    label: '保养人',
+    label: '验证内容',
-    field: 'maintenancer',
+    field: 'verifyContent',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
-      component: 'InputNumber',
+      component: 'Editor',
-      value: 0
+      componentProps: {
-    }
+        valueHtml: '',
+        height: 200
+      }
+    },
   },
   {
-    label: '保养人联系电话',
+    label: '验证时间',
-    field: 'maintenancePhone',
+    field: 'verifyTime',
     sort: 'custom',
-    isSearch: true
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '结果枚举',
+    label: '保养人id',
-    field: 'completeResult',
+    field: 'maintenancer',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
-    label: '完成时间',
+    label: '保养人联系电话',
-    field: 'completionTime2',
+    field: 'maintenancePhone',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
-    label: '保养时间',
+    label: '完成时间',
-    field: 'maintenanceTime',
+    field: 'completionTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -150,58 +241,172 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
         type: 'datetime',
         valueFormat: 'x'
       }
-    }
+    },
   },
+  // {
+  //   label: '保养时间',
+  //   field: 'maintenanceTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   isSearch: true,
+  //   search: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       type: 'daterange',
+  //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+  //     }
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       valueFormat: 'x'
+  //     }
+  //   },
+  // },
   {
-    label: '流程状态枚举',
+    label: '流程状态',
     field: 'status',
     sort: 'custom',
-      dictType: DICT_TYPE.JOB_STATUS,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    form: {
+    dictType: DICT_TYPE.EAM_ORDER_STATUS,
-      component: 'Radio'
+    dictClass: 'string',
-    }
+  },
+  // {
+  //   label: '自动接单',
+  //   field: 'autoOrder',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoPerform',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动验证',
+  //   field: 'autoVerify',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    sort: 'custom',
+    isSearch: false,
   },
   {
     label: '所属厂区编号',
     field: 'factoryAreaCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
     label: '车间编号',
     field: 'workshopCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
-    label: '工段编号',
+    label: '创建时间',
-    field: 'workshopSectionCode',
+    field: 'createTime',
     sort: 'custom',
-    isSearch: true
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
-    label: '是否可用',
+    label: '是否可用默认TRUE',
     field: 'available',
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    isSearch: false,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: false,
-    isSearch: true,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
     form: {
-      component: 'Switch',
+      component: 'DatePicker',
-      value: 'TRUE',
       componentProps: {
-        inactiveValue: 'FALSE',
+        type: 'datetime',
-        activeValue: 'TRUE'
+        valueFormat: 'x'
       }
-    }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
   },
   {
     label: '操作',

src/views/eam/equipmentMaintenanceRecordMain/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #recordNo="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.recordNo)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.recordNo }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -51,7 +51,17 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="EquipmentMaintenanceRecordMain.allSchemas" />
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="EquipmentMaintenanceRecordMain.allSchemas"
+          :detailAllSchemasRules="EquipmentMaintenanceRecordDetailRules"
+          :detailAllSchemas="EquipmentMaintenanceRecordDetail.allSchemas"
+          :apiPage="EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage"
+          :detailButtonIsShowAdd=false
+          :detailButtonIsShowEdit=false
+          :detailButtonIsShowDelete=false
+  />
+
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/eam/equipment-maintenance-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -60,7 +70,9 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from './equipmentMaintenanceRecordMain.data'
+import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
+import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -99,9 +111,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentMaintenanceRecordMain:create'}), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentMaintenanceRecordMain:import'}), // 导入
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentMaintenanceRecordMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +145,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentMaintenanceRecordMain:update'}), // 编辑
+  //defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentMaintenanceRecordMain:delete'}), // 删除
+  //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/eam/equipmentRepairJobDetail/equipmentRepairJobDetail.data.ts

@@ -0,0 +1,145 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const EquipmentRepairJobDetailRules = reactive({
+  number: [required],
+  masterId: [required],
+  concurrencyStamp: [required],
+})
+
+export const EquipmentRepairJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '维修工单号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '主表id',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '故障描述',
+    field: 'describing',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '故障原因关联基础数据',
+    field: 'faultCause',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '解决措施',
+    field: 'workOut',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '维修人员字符串多个',
+    field: 'maintenances',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '是否可用默认TRUE',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/eam/equipmentRepairJobDetail/index.vue

@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="EquipmentRepairJobDetail.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="EquipmentRepairJobDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="EquipmentRepairJobDetailRules"
+    :formAllSchemas="EquipmentRepairJobDetail.allSchemas"
+    :apiUpdate="EquipmentRepairJobDetailApi.updateEquipmentRepairJobDetail"
+    :apiCreate="EquipmentRepairJobDetailApi.createEquipmentRepairJobDetail"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="EquipmentRepairJobDetail.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/equipment-repair-job-detail/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { EquipmentRepairJobDetail,EquipmentRepairJobDetailRules } from './equipmentRepairJobDetail.data'
+import * as EquipmentRepairJobDetailApi from '@/api/eam/equipmentRepairJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'EquipmentRepairJobDetail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(EquipmentRepairJobDetail.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: EquipmentRepairJobDetailApi.getEquipmentRepairJobDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentRepairJobDetail:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentRepairJobDetail:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentRepairJobDetail:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentRepairJobDetail:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentRepairJobDetail:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =EquipmentRepairJobDetail.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await EquipmentRepairJobDetailApi.createEquipmentRepairJobDetail(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await EquipmentRepairJobDetailApi.updateEquipmentRepairJobDetail(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobDetail')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await EquipmentRepairJobDetailApi.deleteEquipmentRepairJobDetail(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await EquipmentRepairJobDetailApi.exportEquipmentRepairJobDetail(tableObject.params)
+    download.excel(data, '维修工单子.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '维修工单子导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await EquipmentRepairJobDetailApi.importTemplate()
+})
+
+</script>

src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts

@@ -0,0 +1,668 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import {BasicFaultCause} from "@/views/eam/basicFaultCause/basicFaultCause.data";
+import * as ItemApi from "@/api/eam/basicFaultCause";
+import {getBasicFaultCausePage} from "@/api/eam/basicFaultCause";
+
+// 表单校验
+export const EquipmentRepairJobMainRules = reactive({
+  number: [required],
+  type: [required],
+  sources: [required],
+  urgency: [required],
+  level: [required],
+  equipmentCode: [required],
+  totalMinutes: [required],
+  faultType: [required],
+  status: [required],
+})
+
+export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '维修工单号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '设备类别',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+  },
+  {
+    label: '报修工单号',
+    field: 'repairNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '来源字典',
+    field: 'sources',
+    sort: 'custom',
+    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+    dictClass: 'string',
+    isSearch: false,
+  },
+  {
+    label: '维修描述',
+    field: 'maintenanceDesc',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '紧急程度',
+    field: 'urgency',
+    sort: 'custom',
+    dictType: DICT_TYPE.EAM_MAINTENANCE_URGENCY,
+    dictClass: 'string',
+    isSearch: true,
+  },
+  {
+    label: '维修级别',
+    field: 'level',
+    sort: 'custom',
+    dictType: DICT_TYPE.EAM_MAINTENANCE_LEVEL,
+    dictClass: 'string',
+    isSearch: true,
+  },
+  {
+    label: '设备编号',
+    field: 'equipmentCode',
+    sort: 'custom',
+    isSearch: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        multiple:true,
+        searchCondition: [{
+          key: 'status',
+          value: 'NORMAL',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否停机',
+    field: 'shutDown',
+    sort: 'custom',
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'string',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    }
+  },
+  {
+    label: '维修开始时间',
+    field: 'startTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '维修结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '维修时长',
+    field: 'totalMinutes',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '验证人',
+    field: 'verifyer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '验证内容',
+    field: 'verifyContent',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '验证时间',
+    field: 'verifyTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '执行人',
+    field: 'maintenancer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '维修人联系电话',
+    field: 'maintenancePhone',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '结果',
+    field: 'completeResult',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '完成时间',
+    field: 'completionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'maintenanceTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '报修时间',
+    field: 'repairTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '报修人',
+    field: 'repairer',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '故障类型',
+    field: 'faultType',
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '流程状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.EAM_REPAIR_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+  },
+  // {
+  //   label: '自动接单',
+  //   field: 'autoOrder',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoPerform',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '自动验证',
+  //   field: 'autoVerify',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '班组类型',
+    field: 'classType',
+    sort: 'custom',
+    isSearch: false,
+  },
+  // {
+  //   label: '所属厂区编号',
+  //   field: 'factoryAreaCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '车间编号',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: false,
+  },
+  // {
+  //   label: '产线编号',
+  //   field: 'lineCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '工序编号',
+  //   field: 'processCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '工位编号',
+  //   field: 'workstationCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用默认TRUE',
+    field: 'available',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const EquipmentRepairJobDetailRules = reactive({
+  number: [required],
+  masterId: [required],
+  concurrencyStamp: [required],
+})
+
+export const EquipmentRepairJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '维修工单号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '主表id',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '故障描述',
+    field: 'describing',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '故障原因',
+    field: 'faultCause',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择 故障原因',
+        searchTitle: '故障原因', // 查询弹窗标题
+        searchAllSchemas: BasicFaultCause.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: ItemApi.getBasicFaultCausePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '解决措施',
+    field: 'workOut',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '维修人员字符串多个',
+    field: 'maintenances',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门id',
+    field: 'departmentCode',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '是否可用默认TRUE',
+    field: 'available',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除人id',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/eam/equipmentRepairJobMain/index.vue

@@ -0,0 +1,320 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="EquipmentRepairJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="EquipmentRepairJobMain.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="EquipmentRepairJobMainRules"
+    :formAllSchemas="EquipmentRepairJobMain.allSchemas"
+    :apiUpdate="EquipmentRepairJobMainApi.updateEquipmentRepairJobMain"
+    :apiCreate="EquipmentRepairJobMainApi.createEquipmentRepairJobMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="EquipmentRepairJobMain.allSchemas"
+          :detailAllSchemas="EquipmentRepairJobDetail.allSchemas"
+          :detailAllSchemasRules="EquipmentRepairJobDetailRules"
+          :apiPage="EquipmentRepairJobDetailApi.getEquipmentRepairJobDetailPage"
+          :apiCreate="EquipmentRepairJobDetailApi.createEquipmentRepairJobDetail"
+          :apiUpdate="EquipmentRepairJobDetailApi.updateEquipmentRepairJobDetail"
+          :apiDelete="EquipmentRepairJobDetailApi.deleteEquipmentRepairJobDetail"
+          :detailButtonIsShowAdd=statusBtn
+          :detailButtonIsShowEdit=statusBtn
+          :detailButtonIsShowDelete=statusBtn
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/equipment-repair-job-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { EquipmentRepairJobMain,EquipmentRepairJobMainRules,EquipmentRepairJobDetail,EquipmentRepairJobDetailRules  } from './equipmentRepairJobMain.data'
+import * as EquipmentRepairJobMainApi from '@/api/eam/equipmentRepairJobMain'
+import * as EquipmentRepairJobDetailApi from '@/api/eam/equipmentRepairJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue'
+
+defineOptions({ name: 'EquipmentRepairJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(EquipmentRepairJobMain.allSchemas.tableColumns)
+const statusBtn = ref(false);
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: EquipmentRepairJobMainApi.getEquipmentRepairJobMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentRepairJobMain:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentRepairJobMain:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentRepairJobMain:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const isShowStatusButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return[
+    defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
+    defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单
+    defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行
+    defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentRepairJobMain:update'}), //完成
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'receive') { // 接单
+    handleReceive(row.id)
+  } else if (val == 'execute') { // 执行
+    handleExecute(row.id)
+  }
+
+
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =EquipmentRepairJobMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await EquipmentRepairJobMainApi.createEquipmentRepairJobMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await EquipmentRepairJobMainApi.updateEquipmentRepairJobMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  if('5' === row.status){
+    statusBtn.value=true
+  }else {
+    statusBtn.value=false
+  }
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobMain')
+}
+
+/** 接单按钮操作 */
+const handleReceive = async (id: number) => {
+  try {
+    // 中止的二次确认
+    await message.delConfirm('是否接单？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '4'
+    // 发起删除
+    await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
+    message.success(t('接单成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 执行按钮操作 */
+const handleExecute = async (id: number) => {
+  try {
+    // 二次确认
+    await message.delConfirm('是否执行所选中任务？');
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '5'
+    // 发起
+    await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value)
+    message.success(t('执行成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await EquipmentRepairJobMainApi.deleteEquipmentRepairJobMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await EquipmentRepairJobMainApi.exportEquipmentRepairJobMain(tableObject.params)
+    download.excel(data, '维修工单主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '维修工单主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await EquipmentRepairJobMainApi.importTemplate()
+})
+
+</script>

src/views/eam/equipmentReportRepairRequest/audiForm.vue

@@ -0,0 +1,141 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
+    <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="审核人" prop="approver">
+            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审核内容" prop="approveContent">
+            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="审核时间" prop="approveTime">
+            <el-date-picker
+              v-model="formData.approveTime"
+              type="datetime"
+              value-format="x"
+              placeholder="选择审核时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
+      <el-button @click="handleClose('close')">取 消</el-button>
+    </template>
+  </Dialog>
+
+<!--添加巡检项弹窗-->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+
+</template>
+<script lang="ts" setup>
+import { SearchTable } from '@/components/SearchTable'
+import {ElInput} from "element-plus";
+import * as EquipmentReportRepairRequestApi from "@/api/eam/equipmentReportRepairRequest";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const tags=ref([])
+
+const inputValue = ref('')
+const inputVisible = ref(false)
+const isDisabled = ref(false)
+const InputRef = ref<InstanceType<typeof ElInput>>()
+
+
+const formData = ref({
+  id:'',
+  number:'',
+  approver: '',
+  approveContent: '',
+  approveTime: '',
+})
+const formRules = reactive({
+  approver: [
+    { required: true, message: '审核人不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  approveContent: [
+    { required: true, message: '审核内容不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  approveTime: [
+    { required: true, message: '审核时间不能为空', trigger: 'blur' },
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  //初始化数据
+  formData.value.id = row.id
+  formData.value.number = row.number
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async (val) => {
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
+   // 校验表单
+   if (!basicFormRef) return
+   const valid = await basicFormRef.value.validate()
+   if (!valid) return
+
+   //发送数据
+   await EquipmentReportRepairRequestApi.updateEquipmentReportRepairRequest(formData.value)
+   dialogVisible.value = false
+}
+
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
+}
+
+// 传递给父类
+const emit = defineEmits(['close','success'])
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>

src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from "@/api/wms/workshop";
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const EquipmentReportRepairRequestRules = reactive({
@@ -9,7 +13,9 @@ export const EquipmentReportRepairRequestRules = reactive({
   urgency: [required],
   repairmaner: [required],
   status: [required],
-  concurrencyStamp: [required]
+  shutDown:[required],
+  repairPhone:[required],
+  available:[required],
 })
 
 export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]>([
@@ -17,7 +23,9 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     label: '报修编号',
     field: 'number',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false,
+    isDetail:true,
   },
   {
     label: '类型',
@@ -25,16 +33,32 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
-    form: {
-      component: 'SelectV2'
-    }
   },
   {
-    label: '设备或工装编号',
+    label: '设备工装编号',
     field: 'equipmentCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        multiple:true,
+        searchCondition: [{
+          key: 'status',
+          value: 'NORMAL',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '紧急程度',
@@ -51,15 +75,12 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.FAILURE_REASON,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
   },
   {
     label: '故障描述',
     field: 'describing',
     sort: 'custom',
-    isSearch: true
+    isSearch: false
   },
   {
     label: '是否停机',
@@ -76,80 +97,76 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     label: '报修图片',
     field: 'images',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
-  },
-  {
-    label: '所属厂区编号',
-    field: 'factoryAreaCode',
-    sort: 'custom',
-    isSearch: true
   },
+  // {
+  //   label: '所属厂区编号',
+  //   field: 'factoryAreaCode',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   {
     label: '车间编号',
     field: 'workshopCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
-  },
+    required: true,
-  {
+    form: {
-    label: '工段编号',
+      // labelMessage: '信息提示说明！！！',
-    field: 'workshopSectionCode',
+      componentProps: {
-    sort: 'custom',
+        isSearchList: true, // 开启查询弹窗
-    isSearch: true
+        searchListPlaceholder: '车间', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
   },
   {
     label: '报修人',
     field: 'repairmaner',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
   },
   {
     label: '报修人联系电话',
     field: 'repairPhone',
     sort: 'custom',
-    isSearch: true
+    isSearch: false
   },
   {
     label: '报修状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    dictType: DICT_TYPE.EAM_REPAIR_REPORT_STATUS,
-    form: {
+    dictClass: 'string',
-      component: 'Radio'
+    isSearch: false,
-    }
+    isForm: false,
   },
   {
     label: '审核人',
     field: 'approver',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
   },
   {
     label: '审核内容',
     field: 'approveContent',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    }
   },
   {
     label: '审核时间',
     field: 'approveTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -166,29 +183,29 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-  {
+  // {
-    label: '自动审核',
+  //   label: '自动审核',
-    field: 'autoExamine',
+  //   field: 'autoExamine',
-    sort: 'custom',
+  //   sort: 'custom',
-    isSearch: true
+  //   isSearch: true
-  },
+  // },
-  {
+  // {
-    label: '自动通过',
+  //   label: '自动通过',
-    field: 'autoAgree',
+  //   field: 'autoAgree',
-    sort: 'custom',
+  //   sort: 'custom',
-    isSearch: true
+  //   isSearch: true
-  },
+  // },
-  {
+  // {
-    label: '自动确认',
+  //   label: '自动确认',
-    field: 'autoVerify',
+  //   field: 'autoVerify',
-    sort: 'custom',
+  //   sort: 'custom',
-    isSearch: true
+  //   isSearch: true
-  },
+  // },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
     label: '是否可用',

src/views/eam/equipmentReportRepairRequest/index.vue

@@ -27,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -48,11 +48,15 @@
     :apiCreate="EquipmentReportRepairRequestApi.createEquipmentReportRepairRequest"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="EquipmentReportRepairRequest.allSchemas" />
 
+  <!-- 审核页面 -->
+  <AudiForm ref="audiFormRef" @success="getData" @close="getClosed"/>
+
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/eam/equipment-report-repair-request/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -65,6 +69,12 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import AudiForm from '@/views/eam/equipmentReportRepairRequest/audiForm.vue'
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
+import * as ToolItemApi from "@/api/eam/toolAccounts";
+import {createEquipmentWeixiuOrder} from "@/api/eam/equipmentReportRepairRequest";
 
 defineOptions({ name: 'EquipmentReportRepairRequest' })
 
@@ -99,9 +109,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentReportRepairRequest:create'}), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentReportRepairRequest:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentReportRepairRequest:import'}), // 导入
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentReportRepairRequest:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentReportRepairRequest:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentReportRepairRequest:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -131,11 +141,26 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+
+const isShowStatusButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentReportRepairRequest:update'}), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentReportRepairRequest:delete'}), // 删除
+    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row, ['0']),hasPermi: 'eam:equipmentReportRepairRequest:update'}), // 编辑
-]
+    defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row, ['0']), hasPermi: 'eam:equipmentReportRepairRequest:update'}), // 审核
+    defaultButtons.mainListAuditedBtn({hide: isShowStatusButton(row, ['2']), hasPermi: 'eam:equipmentReportRepairRequest:update'}), // 审核完成
+    defaultButtons.mainListRevokeBtn({hide: isShowStatusButton(row, ['0']), hasPermi: 'eam:equipmentReportRepairRequest:update'}), // 撤回
+    defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentReportRepairRequest:update'}),
+    defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentReportRepairRequest:update'}), // 删除
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -143,12 +168,31 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'auditing') { // 审核
+    handleAuditing(row.id)
+  } else if (val == 'revoke') { // 撤回
+    handleRevoke(row.id)
+  } else if (val == 'audited') { // 审核完成
+    handleAudited(row)
+  } else if (val == 'finish') { // 完成
+    handleFinish(row.id)
   }
 }
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if(type == "create"){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'status'){
+      }
+    })
+  }else{
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'status'){
+      }
+    })
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -182,6 +226,79 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentReportRepairRequest')
 }
 
+//完成按钮  并生成维修工单
+const handleFinish = async (id: number) => {
+  await message.delConfirm('是否完成,并创建维修工单？');
+  try {
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '5'
+    await EquipmentReportRepairRequestApi.createEquipmentWeixiuOrder(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+//审核完成按钮
+const handleAudited = async (row) => {
+  message.confirmAudi(t('')).then(async () => {
+    //打开提交表单
+    audiFormRef.value.open('update', row);
+  }).catch(async (action: Action) => {
+    if(action === 'cancel'){
+      const params = ref({
+        id: '',
+        status:'',
+      })
+      params.value.id = row.id
+      params.value.status = '4'
+      await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
+      message.success(t('common.updateSuccess'))
+      // 刷新列表
+      await getList()
+    }
+  })
+}
+
+//审核按钮
+const audiFormRef = ref()
+const handleAuditing = async (id: number) => {
+  await message.delConfirm('是否审核所选中工单？');
+  try {
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '2'
+    await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 撤回按钮操作 */
+const handleRevoke = async (id: number) => {
+  await message.delConfirm('是否撤回所选中工单？');
+  try {
+    const params = ref({
+      id: '',
+      status:'',
+    })
+    params.value.id = id
+    params.value.status = '1'
+    await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
+    message.success(t('common.updateSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -226,6 +343,62 @@ const importSuccess = () => {
   getList()
 }
 
+//audiForm 关闭按钮回传
+const getClosed=(val)=> {
+  nextTick?.(() => {
+    getList()
+  })
+}
+
+//audiForm 提交按钮回传
+const getData=(val)=> {
+  nextTick?.(async () => {
+
+      try {
+        const params = ref({
+          id: '',
+          status:'',
+        })
+        params.value.id = val
+        params.value.status = '3'
+        await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
+        message.success(t('工单已流转'))
+        // 刷新列表
+        await getList()
+      } catch {}
+
+    }
+  )
+}
+
+
+const onChange = (field, item) => {
+  //设备
+  if(field == 'type' && item == 'DEVICE'){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'equipmentCode') {
+        basicFormRef.value.formRef.setValues({
+          equipmentCode:''
+        })
+        items.componentProps.searchAllSchemas = EquipmentAccounts.allSchemas
+        items.componentProps.searchPage = EquipmentItemApi.getEquipmentAccountsPage
+      }
+    })
+  }
+  //工装
+  if(field == 'type' && item == 'EQUIPMENT'){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'equipmentCode') {
+        basicFormRef.value.formRef.setValues({
+          equipmentCode:''
+        })
+        items.componentProps.searchAllSchemas = ToolAccounts.allSchemas
+        items.componentProps.searchPage = ToolItemApi.getToolAccountsPage
+      }
+    })
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/home/components/material.vue

@@ -36,10 +36,11 @@
         <!-- 呆滞库存预警 -->
         <div class="title">{{ t('home.slack_stock_warning')}}</div>
         <el-table
-          :data="materialData?.stagnantBalanceList"
+          :data="stagnantBalanceList"
           style="width: 100%"
           stripe
           height="240px"
+          row-key="id"
         >
           <el-table-column prop="itemCode" :label="t('home.material_code')" width="180px" />
           <el-table-column prop="batch" :label="t('home.batch')" width="180px" />
@@ -88,7 +89,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- <el-pagination style="margin-top:10px"
+        <el-pagination style="margin-top:10px"
           v-model:current-page="currentPage_stagnantBalance"
           v-model:page-size="pageSize_stagnantBalance"
           :page-sizes="[10, 20, 30, 50, 100]"
@@ -96,17 +97,19 @@
           :background="false"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total_stagnantBalance"
-          @current-change="handleCurrentChange_stagnantBalance"
+          @size-change="getStagnantBalance"
-        /> -->
+          @current-change="getStagnantBalance"
+        />
       </div>
       <div class="data1 w-[47.3%]">
         <!-- 超期库存预警 -->
         <div class="title">{{ t('home.overstock_warning') }}</div>
         <el-table
-          :data="materialData?.overdueBalanceList"
+          :data="overdueBalanceList"
           style="width: 100%"
           stripe
           height="240px"
+          row-key="id"
         >
           <el-table-column prop="itemCode" :label="t('home.material_code')" width="180px" />
           <el-table-column prop="batch" :label="t('home.batch')" width="180px" />
@@ -155,7 +158,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- <el-pagination style="margin-top:10px"
+        <el-pagination style="margin-top:10px"
           v-model:current-page="currentPage_overdueBalance"
           v-model:page-size="pageSize_overdueBalance"
           :page-sizes="[10, 20, 30, 50, 100]"
@@ -163,8 +166,9 @@
           :background="false"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total_overdueBalance"
-          @current-change="handleCurrentChange_overdueBalance"
+          @size-change="getOverdueBalance"
-        /> -->
+          @current-change="getOverdueBalance"
+        />
       </div>
     </div>
     <div class="two-row mt-14px">
@@ -172,7 +176,7 @@
         <!-- 高低储预警 -->
         <div class="title">{{ t('home.high_and_low_storage_warning') }}</div>
         <el-table
-          :data="materialData?.warningBalanceList"
+          :data="warningBalanceList"
           style="width: 100%"
           stripe
           height="240px"
@@ -224,7 +228,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- <el-pagination style="margin-top:10px"
+        <el-pagination style="margin-top:10px"
           v-model:current-page="currentPage_warningBalance"
           v-model:page-size="pageSize_warningBalance"
           :page-sizes="[10, 20, 30, 50, 100]"
@@ -232,8 +236,9 @@
           :background="false"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total_warningBalance"
-          @current-change="handleCurrentChange_warningBalance"
+          @size-change="getWarningBalance"
-        /> -->
+          @current-change="getWarningBalance"
+        />
       </div>
       <div class="data1  w-[47.3%]">
         <!-- 待处理任务 -->
@@ -262,6 +267,7 @@ const getMaterialData =  () => {
     getJobCharts()
   })
 }
+
 const formatter = (type, dict) => {
   let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
   return str
@@ -285,32 +291,58 @@ const getJobCharts = async () => {
   lineIndex.value++
 }
 onMounted(() => {
-  // getMaterialData()
+  getMaterialData()
+  //呆滞库存预警 超期库存预警
+  Promise.all([ getStagnantBalance(),getOverdueBalance(),getWarningBalance()])
 })
 
 // 呆滞库存预警
 const currentPage_stagnantBalance = ref(1)
 const pageSize_stagnantBalance = ref(10)
 const total_stagnantBalance= ref(100)
-const handleCurrentChange_stagnantBalance = (val)=>{
+const stagnantBalanceList = ref([])
-  console.log('呆滞库存预警',val)
+const getStagnantBalance = ()=>{
+    IndexApi.getStagnantBalance({
+      pageNo: currentPage_stagnantBalance.value,
+      pageSize: pageSize_stagnantBalance.value
+    }).then((res) => {
+      console.log('getStagnantBalance',res)
+      stagnantBalanceList.value = res.list
+      total_stagnantBalance.value = res.total
+    })
 }
-
 // 超期库存预警
 const currentPage_overdueBalance = ref(1)
 const pageSize_overdueBalance = ref(10)
 const total_overdueBalance= ref(100)
-const handleCurrentChange_overdueBalance = (val)=>{
+const overdueBalanceList = ref([])
-  console.log('超期库存预警',val)
+const getOverdueBalance = ()=>{
+    IndexApi.getOverdueBalance({
+      pageNo: currentPage_overdueBalance.value,
+      pageSize: pageSize_overdueBalance.value
+    }).then((res) => {
+      console.log('getOverdueBalance',res)
+      overdueBalanceList.value = res.list
+      total_overdueBalance.value = res.total
+    })
 }
 
 // 高低储预警
 const currentPage_warningBalance = ref(1)
 const pageSize_warningBalance = ref(10)
 const total_warningBalance= ref(100)
-const handleCurrentChange_warningBalance = (val)=>{
+const warningBalanceList = ref([])
-  console.log('高低储预警',val)
+const getWarningBalance = ()=>{
+    IndexApi.getWarningBalance({
+      pageNo: currentPage_warningBalance.value,
+      pageSize: pageSize_warningBalance.value
+    }).then((res) => {
+      console.log('getWarningBalance',res)
+      warningBalanceList.value = res.list
+      total_warningBalance.value = res.total
+    })
 }
+
 </script>
 <style scoped lang="scss">
 .title {

src/views/home/components/produce.vue

@@ -3,9 +3,10 @@
   <div class="row">
     <div class="two-row">
       <div class="data1 w-[47.3%]">
+        <!-- 今日生产计划 -->
         <div class="title">{{ t('home.today_production_plan')}}</div>
         <el-table
-          :data="produceData?.productionTodayList"
+          :data="productionTodayList"
           style="width: 100%"
           stripe
           height="240px"
@@ -33,10 +34,22 @@
           </el-table-column>
           <el-table-column prop="businessType" :label="t('home.business_type')" />
         </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_productionToday"
+          v-model:page-size="pageSize_productionToday"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_productionToday"
+          @size-change="getProductionToday"
+          @current-change="getProductionToday"
+        />
       </div>
       <div class="data1 w-[47.3%]">
+        <!-- 线边安全库存 -->
         <div class="title">{{ t('home.line_side_safety_stock') }}</div>
-        <el-table :data="produceData?.safeLocationList" style="width: 100%" stripe height="240px">
+        <el-table :data="safeLocationList" style="width: 100%" stripe height="240px">
           <el-table-column prop="code" :label="t('home.code')" width="180" />
           <el-table-column prop="name" :label="t('home.name')" width="180" />
           <el-table-column prop="warehouseCode" :label="t('home.warehouse_code')" width="180" />
@@ -64,13 +77,25 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_safeLocation"
+          v-model:page-size="pageSize_safeLocation"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_safeLocation"
+          @size-change="getSafeLocation"
+          @current-change="getSafeLocation"
+        />
       </div>
     </div>
     <div class="two-row mt-14px">
       <div class="data1 w-[47.3%]">
+        <!-- 待上架成品库存 -->
         <div class="title">{{t('home.inventory_of_finished_products_waiting_to_be_putway')}}</div>
         <el-table
-          :data="produceData?.productputawayJobDetailList"
+          :data="productputawayJobDetailList"
           style="width: 100%"
           stripe
           height="240px"
@@ -153,6 +178,17 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_productputawayJobDetail"
+          v-model:page-size="pageSize_productputawayJobDetail"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_productputawayJobDetail"
+          @size-change="getProductputawayJobDetail"
+          @current-change="getProductputawayJobDetail"
+        />
       </div>
       <div class="data1 w-[47.3%]">
         <div class="title">{{t('home.waiting_tasks')}}</div>
@@ -201,8 +237,57 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
+// 今日生产计划
+const currentPage_productionToday = ref(1)
+const pageSize_productionToday = ref(10)
+const total_productionToday= ref(100)
+const productionTodayList = ref([])
+const getProductionToday = ()=>{
+    IndexApi.getProductionToday({
+      pageNo: currentPage_productionToday.value,
+      pageSize: pageSize_productionToday.value
+    }).then((res) => {
+      console.log('getPurchasereturnRecordMonth',res)
+      productionTodayList.value = res.list
+      total_productionToday.value = res.total
+    })
+}
+// 线边安全库存
+const currentPage_safeLocation = ref(1)
+const pageSize_safeLocation = ref(10)
+const total_safeLocation= ref(100)
+const safeLocationList = ref([])
+const getSafeLocation = ()=>{
+    IndexApi.getSafeLocation({
+      pageNo: currentPage_safeLocation.value,
+      pageSize: pageSize_safeLocation.value
+    }).then((res) => {
+      console.log('getPurchasereturnRecordMonth',res)
+      safeLocationList.value = res.list
+      total_safeLocation.value = res.total
+    })
+}
+
+// 待上架成品库存
+const currentPage_productputawayJobDetail = ref(1)
+const pageSize_productputawayJobDetail = ref(10)
+const total_productputawayJobDetail= ref(100)
+const productputawayJobDetailList = ref([])
+const getProductputawayJobDetail = ()=>{
+    IndexApi.getProductputawayJobDetail({
+      pageNo: currentPage_productputawayJobDetail.value,
+      pageSize: pageSize_productputawayJobDetail.value
+    }).then((res) => {
+      console.log('待上架成品库存',res)
+      productputawayJobDetailList.value = res.list
+      total_productputawayJobDetail.value = res.total
+    })
+}
+
+
 onMounted( () => {
   // getProduceData()
+  Promise.all([getProductionToday(),getSafeLocation(),getProductputawayJobDetail()])
 })
 </script>
 <style scoped lang="scss">

src/views/home/components/supplierIndex.vue

@@ -70,161 +70,6 @@
         <Echart :options="pieOptions" :height="280" :key="lineIndex" />
       </div>
     </div>
-    <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{t('home.latest_news')}}</div>
-        <el-table :data="notaicList" style="width: 100%" stripe height="240px">
-          <el-table-column :label="t('home.number')" align="center" prop="id" />
-          <el-table-column :label="t('home.user_type')" align="center" prop="userType">
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('home.user_number')" align="center" prop="userId" width="80" />
-          <el-table-column :label="t('home.template_coding')" align="center" prop="templateCode" width="80" />
-          <el-table-column :label="t('home.sender_number')" align="center" prop="templateNickname" width="180" />
-          <el-table-column
-            :label="t('home.template_content')"
-            align="center"
-            prop="templateContent"
-            width="200"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            :label="t('home.template_parameters')"
-            align="center"
-            prop="templateParams"
-            width="180"
-            show-overflow-tooltip
-          >
-            <template #default="scope"> {{ scope.row.templateParams }}</template>
-          </el-table-column>
-          <el-table-column :label="t('home.template_type')" align="center" prop="templateType" width="120">
-            <template #default="scope">
-              <dict-tag
-                :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
-                :value="scope.row.templateType"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('home.read')" align="center" prop="readStatus" width="100">
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('home.read_time')"
-            align="center"
-            prop="readTime"
-            width="180"
-            :formatter="dateFormatter"
-          />
-          <el-table-column
-            :label="t('home.create_time')"
-            align="center"
-            prop="createTime"
-            width="180"
-            :formatter="dateFormatter"
-          />
-          <!-- <el-table-column label="操作" align="center"  fixed="right" width="120">
-        <template #default="scope">
-          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
-            <Icon icon="ep:document-copy" />
-            详情
-          </el-button>
-        </template>
-      </el-table-column> -->
-        </el-table>
-      </div>
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{ t('home.latest_deduction_details')}}</div>
-        <el-table :data="tableData" style="width: 100%" stripe height="240px">
-          <el-table-column prop="title" :label="t('home.title')" />
-          <el-table-column prop="name" :label="t('home.publisher')" />
-          <el-table-column prop="date" :label="t('home.publish_date')" />
-        </el-table>
-      </div>
-    </div>
-    <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{t('home.month_return_detials')}}</div>
-        <el-table
-          :data="supplierData?.purchasereturnRecordMonth"
-          style="width: 100%"
-          stripe
-          height="240px"
-        >
-          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
-          <el-table-column prop="fromPackingNumber" :label="t('home.source_package_number')" width="180" />
-          <el-table-column prop="toPackingNumber" :label="t('home.destination_package_number')" width="180" />
-          <el-table-column prop="fromContainerNumber" :label="t('home.source_appliance_number')" width="120" />
-          <el-table-column prop="toContainerNumber" :label="t('home.destination_appliance_number')" width="120" />
-          <el-table-column prop="fromBatch" :label="t('home.source_batch')" width="120" />
-          <el-table-column prop="toBatch" :label="t('home.destination_batch')" width="120" />
-          <el-table-column prop="altBatch" :label="t('home.replace_batch')" width="120" />
-          <el-table-column prop="fromLocationCode" :label="t('home.source_location_code')" width="120" />
-          <el-table-column prop="toLocationCode" :label="t('home.destination_location_code')" width="120" />
-          <el-table-column prop="fromLocationGroupCode" :label="t('home.source_location_group_code')" width="120" />
-          <el-table-column prop="toLocationGroupCode" :label="t('home.destination_location_group_code')" width="120" />
-          <el-table-column prop="fromAreaCode" :label="t('home.source_location_area_code')" width="120" />
-          <el-table-column prop="toAreaCode" :label="t('home.destination_location_area_code')" width="120" />
-          <el-table-column prop="fromOwnerCode" :label="t('home.source_shipper_code')" width="120" />
-          <el-table-column prop="toOwnerCode" :label="t('home.destination_shipper_code')" width="120" />
-          <el-table-column prop="inventoryStatus" :label="t('home.inventory_state')" width="120">
-            <template #default="scope">
-              {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
-          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
-          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
-          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
-          <el-table-column prop="amount" :label="t('home.money')" width="120" />
-          <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
-          <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
-          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
-          <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
-          <el-table-column prop="qty" :label="t('home.amount')" width="120" />
-          <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">
-            <template #default="scope">
-              {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="projectCode" :label="t('home.item_code')" width="120" />
-          <el-table-column prop="remark" :label="t('home.comment')" width="120" />
-          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
-            <template #default="scope">
-              <span>{{ formatDate(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
-        </el-table>
-      </div>
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{t('home.claim_details_month')}}</div>
-        <el-table
-          :data="supplierData?.purchasereturnRecordMonth"
-          style="width: 100%"
-          stripe
-          height="240px"
-        >
-          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
-          <el-table-column prop="fromBatch" :label="t('home.batch')" width="120" />
-          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
-          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
-          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
-          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
-          <el-table-column prop="amount" :label="t('home.money')" width="120" />
-          <el-table-column prop="code" label="代码" width="160" />
-          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
-            <template #default="scope">
-              <span>{{ formatDate(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
-        </el-table>
-      </div>
-    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -354,9 +199,42 @@ const formatter = (type,dict) => {
   let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
   return str
 }
+
+// 本月退货明细
+const currentPage_purchasereturn = ref(1)
+const pageSize_purchasereturn = ref(10)
+const total_purchasereturn= ref(100)
+const purchasereturnRecordMonth = ref([])
+const getPurchasereturnRecordMonth = ()=>{
+    IndexApi.getPurchasereturnRecordMonth({
+      pageNo: currentPage_purchasereturn.value,
+      pageSize: pageSize_purchasereturn.value
+    }).then((res) => {
+      console.log('getPurchasereturnRecordMonth',res)
+      purchasereturnRecordMonth.value = res.list
+      total_purchasereturn.value = res.total
+    })
+}
+// 本月索赔明细
+const currentPage_purchaseclaim = ref(1)
+const pageSize_purchaseclaim = ref(10)
+const total_purchaseclaim= ref(100)
+const purchaseclaimRecordMonth = ref([])
+const getPurchaseclaimRecordMonth = ()=>{
+    IndexApi.getPurchaseclaimRecordMonth({
+      pageNo: currentPage_purchaseclaim.value,
+      pageSize: pageSize_purchaseclaim.value
+    }).then((res) => {
+      console.log('getPurchaseclaimRecordMonth',res)
+      purchaseclaimRecordMonth.value = res.list
+      total_purchaseclaim.value = res.total
+    })
+}
 onMounted( () => {
-  // getSupplierData()
+  getSupplierData()
   getList()
+  // 本月索赔明细
+  Promise.all([getPurchaseclaimRecordMonth(),getPurchasereturnRecordMonth()])
 })
 </script>
 <style scoped lang="scss">

src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue

@@ -0,0 +1,510 @@
+<!-- 供应商首页 -->
+<template>
+  <div class="one-row">
+    <div class="data">
+      <div class="data-item">
+        <div class="small-title">{{ t('home.number_orders') }}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item1">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchaseCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{ t('home.number_open') }}</div>
+            </div>
+            <img src="../../../assets/imgs/icon1.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item2 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchaseCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{ t('home.number_total_order') }}</div>
+            </div>
+            <img src="../../../assets/imgs/icon5.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">{{t('home.number_planned_shipments')}}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item3">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchasePlanCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_open_plans')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon6.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item4 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchasePlanCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_all_plans')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon3.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">{{t('home.number_invoices')}}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item5">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.notTakeSupplierdeliverCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_unreceived_orders')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon4.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item6 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.takeSupplierdeliverCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_orders_received')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon2.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[65%]">
+        <div class="title">{{t('home.invoice_trend_month')}}</div>
+        <Echart :options="lineOptions" :height="280" :key="lineIndex" />
+      </div>
+      <div class="data1 w-[35%] ml-14px">
+        <div class="title">{{t('home.TOP10_parts_shipped_month')}}</div>
+        <Echart :options="pieOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">{{t('home.latest_news')}}</div>
+        <el-table :data="notaicList" style="width: 100%" stripe height="240px">
+          <el-table-column :label="t('home.number')" align="center" prop="id" />
+          <el-table-column :label="t('home.user_type')" align="center" prop="userType">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('home.user_number')" align="center" prop="userId" width="80" />
+          <el-table-column :label="t('home.template_coding')" align="center" prop="templateCode" width="80" />
+          <el-table-column :label="t('home.sender_number')" align="center" prop="templateNickname" width="180" />
+          <el-table-column
+            :label="t('home.template_content')"
+            align="center"
+            prop="templateContent"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            :label="t('home.template_parameters')"
+            align="center"
+            prop="templateParams"
+            width="180"
+            show-overflow-tooltip
+          >
+            <template #default="scope"> {{ scope.row.templateParams }}</template>
+          </el-table-column>
+          <el-table-column :label="t('home.template_type')" align="center" prop="templateType" width="120">
+            <template #default="scope">
+              <dict-tag
+                :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
+                :value="scope.row.templateType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('home.read')" align="center" prop="readStatus" width="100">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="t('home.read_time')"
+            align="center"
+            prop="readTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <el-table-column
+            :label="t('home.create_time')"
+            align="center"
+            prop="createTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <!-- <el-table-column label="操作" align="center"  fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column> -->
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">{{ t('home.latest_deduction_details')}}</div>
+        <el-table :data="tableData" style="width: 100%" stripe height="240px">
+          <el-table-column prop="title" :label="t('home.title')" />
+          <el-table-column prop="name" :label="t('home.publisher')" />
+          <el-table-column prop="date" :label="t('home.publish_date')" />
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <!-- 本月退货明细 -->
+        <div class="title">{{t('home.month_return_detials')}}</div>
+        <el-table
+          :data="purchasereturnRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
+          <el-table-column prop="fromPackingNumber" :label="t('home.source_package_number')" width="180" />
+          <el-table-column prop="toPackingNumber" :label="t('home.destination_package_number')" width="180" />
+          <el-table-column prop="fromContainerNumber" :label="t('home.source_appliance_number')" width="120" />
+          <el-table-column prop="toContainerNumber" :label="t('home.destination_appliance_number')" width="120" />
+          <el-table-column prop="fromBatch" :label="t('home.source_batch')" width="120" />
+          <el-table-column prop="toBatch" :label="t('home.destination_batch')" width="120" />
+          <el-table-column prop="altBatch" :label="t('home.replace_batch')" width="120" />
+          <el-table-column prop="fromLocationCode" :label="t('home.source_location_code')" width="120" />
+          <el-table-column prop="toLocationCode" :label="t('home.destination_location_code')" width="120" />
+          <el-table-column prop="fromLocationGroupCode" :label="t('home.source_location_group_code')" width="120" />
+          <el-table-column prop="toLocationGroupCode" :label="t('home.destination_location_group_code')" width="120" />
+          <el-table-column prop="fromAreaCode" :label="t('home.source_location_area_code')" width="120" />
+          <el-table-column prop="toAreaCode" :label="t('home.destination_location_area_code')" width="120" />
+          <el-table-column prop="fromOwnerCode" :label="t('home.source_shipper_code')" width="120" />
+          <el-table-column prop="toOwnerCode" :label="t('home.destination_shipper_code')" width="120" />
+          <el-table-column prop="inventoryStatus" :label="t('home.inventory_state')" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
+          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
+          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
+          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
+          <el-table-column prop="amount" :label="t('home.money')" width="120" />
+          <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
+          <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
+          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
+          <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
+          <el-table-column prop="qty" :label="t('home.amount')" width="120" />
+          <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="projectCode" :label="t('home.item_code')" width="120" />
+          <el-table-column prop="remark" :label="t('home.comment')" width="120" />
+          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
+        </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_purchasereturn"
+          v-model:page-size="pageSize_purchasereturn"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_purchasereturn"
+          @size-change="getPurchasereturnRecordMonth"
+          @current-change="getPurchasereturnRecordMonth"
+        />
+      </div>
+      <div class="data1 w-[47.3%]">
+        <!-- 本月索赔明细 -->
+        <div class="title">{{t('home.claim_details_month')}}</div>
+        <el-table
+          :data="purchaseclaimRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
+          <el-table-column prop="fromBatch" :label="t('home.batch')" width="120" />
+          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
+          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
+          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
+          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
+          <el-table-column prop="amount" :label="t('home.money')" width="120" />
+          <el-table-column prop="code" label="代码" width="160" />
+          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
+        </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_purchaseclaim"
+          v-model:page-size="pageSize_purchaseclaim"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_purchaseclaim"
+          @size-change="getPurchaseclaimRecordMonth"
+          @current-change="getPurchaseclaimRecordMonth"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { lineOptions, pieOptions } from '../echarts-data'
+import { formatDate,dateFormatter } from '@/utils/formatTime'
+
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import * as IndexApi from '@/api/home'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+const { t } = useI18n()
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    title: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-02',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-04',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  }
+]
+const supplierData = ref()
+const lineIndex = ref(0)
+// 本月发货单趋势
+const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
+const getInvoiceCharts = async () => {
+  set(
+    lineOptionsData,
+    'xAxis.data',
+    supplierData.value.supplierdeliverMonthCount.map((v) => v.date)
+  )
+  set(lineOptionsData, 'legend.data', [t('home.invoice_trend_month')])
+  set(lineOptionsData, 'series', [
+    {
+      name: t('home.invoice_trend_month'),
+      smooth: true,
+      type: 'line',
+      itemStyle: {},
+      animationDuration: 2800,
+      animationEasing: 'quadraticOut',
+      data: supplierData.value.supplierdeliverMonthCount.map((v) => v.count)
+    }
+  ])
+  lineIndex.value++
+}
+//本月发货零件TOP10
+const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+const getPartTOPCharts = async () => {
+  const data = [
+    { value: 335, name: 'analysis.directAccess' },
+    { value: 310, name: 'analysis.mailMarketing' },
+    { value: 234, name: 'analysis.allianceAdvertising' },
+    { value: 135, name: 'analysis.videoAdvertising' },
+    { value: 1548, name: 'analysis.searchEngines' }
+  ]
+  console.log(supplierData.value.supplierdeliverItemMonthTop)
+  set(
+    pieOptionsData,
+    'legend.data',
+    supplierData.value.supplierdeliverItemMonthTop.map((v) => v.itemCode)
+  )
+  pieOptionsData!.series![0].data = supplierData.value.supplierdeliverItemMonthTop.map((v) => {
+    return {
+      name: v.itemCode,
+      value: v.qty
+    }
+  })
+  lineIndex.value++
+}
+// 获取供应商数据
+const getSupplierData = async () => {
+  IndexApi.getSupplierData().then((res) => {
+    supplierData.value = res
+    getInvoiceCharts()
+    getPartTOPCharts()
+  })
+}
+// 最新消息
+const notaicList = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userType: undefined,
+  userId: undefined,
+  templateCode: undefined,
+  templateType: undefined,
+  createTime: []
+})
+/** 查询列表 */
+const getList = async () => {
+  try {
+    const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+    notaicList.value = data.list
+  } finally {
+  }
+}
+const formatter = (type,dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+
+// 本月退货明细
+const currentPage_purchasereturn = ref(1)
+const pageSize_purchasereturn = ref(10)
+const total_purchasereturn= ref(100)
+const purchasereturnRecordMonth = ref([])
+const getPurchasereturnRecordMonth = ()=>{
+    IndexApi.getPurchasereturnRecordMonth({
+      pageNo: currentPage_purchasereturn.value,
+      pageSize: pageSize_purchasereturn.value
+    }).then((res) => {
+      console.log('getPurchasereturnRecordMonth',res)
+      purchasereturnRecordMonth.value = res.list
+      total_purchasereturn.value = res.total
+    })
+}
+// 本月索赔明细
+const currentPage_purchaseclaim = ref(1)
+const pageSize_purchaseclaim = ref(10)
+const total_purchaseclaim= ref(100)
+const purchaseclaimRecordMonth = ref([])
+const getPurchaseclaimRecordMonth = ()=>{
+    IndexApi.getPurchaseclaimRecordMonth({
+      pageNo: currentPage_purchaseclaim.value,
+      pageSize: pageSize_purchaseclaim.value
+    }).then((res) => {
+      console.log('getPurchaseclaimRecordMonth',res)
+      purchaseclaimRecordMonth.value = res.list
+      total_purchaseclaim.value = res.total
+    })
+}
+onMounted( () => {
+  getSupplierData()
+  getList()
+  // 本月索赔明细
+  Promise.all([getPurchaseclaimRecordMonth(),getPurchasereturnRecordMonth()])
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .data-item {
+    width: calc(100% / 3);
+    padding: 10px 0px;
+    background: white;
+    .small-title {
+      padding: 0px 14px 10px;
+    }
+    .small-data {
+      display: flex;
+      align-content: center;
+      justify-content: space-between;
+      padding: 0px 14px;
+      .small-data-item {
+        width: 50%;
+        height: 70px;
+        display: flex;
+        align-items: center;
+        border-radius: 6px;
+        color: white;
+        padding: 0px 20px;
+        .small-data-item-txt {
+          flex: 1;
+          div {
+            &:nth-child(1) {
+              font-size: 20px;
+              span {
+                font-size: 12px;
+                padding-left: 6px;
+              }
+            }
+            &:nth-child(2) {
+              font-size: 12px;
+            }
+          }
+        }
+        .img {
+          width: 30px;
+          opacity: 0.5;
+        }
+      }
+      .small-data-item1 {
+        background: linear-gradient(to left, #fd817d, #fcad80);
+      }
+      .small-data-item2 {
+        background: linear-gradient(to left, #46c6fa, #336bfe);
+      }
+      .small-data-item3 {
+        background: linear-gradient(to left, #96a6cc, #595f82);
+      }
+      .small-data-item4 {
+        background: linear-gradient(to left, #08dcd5, #46e2bb);
+      }
+      .small-data-item5 {
+        background: linear-gradient(to left, #f4c46b, #ffb313);
+      }
+      .small-data-item6 {
+        background: linear-gradient(to left, #6eccf8, #02acfd);
+      }
+    }
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>

src/views/home/index.vue

@@ -5,10 +5,10 @@
     <product  v-hasRole="['super_admin']"/>
     <produce  v-hasRole="['super_admin']"/> -->
     <supplierIndex />
-    <material/>
+    <!-- <material/> -->
     <!-- 和 material 中四个table重复了，先去掉了 -->
     <!-- <product/> --> 
-    <produce/>
+    <!-- <produce/> -->
   </div>
 </template>
 <script lang="ts" setup>

src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts

@@ -116,7 +116,15 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isForm: false
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '是否可用',

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

@@ -80,6 +80,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段

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

@@ -48,6 +48,7 @@
     :apiCreate="DockApi.createDock"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -66,6 +67,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 defineOptions({ name: 'Dock' })
 
@@ -164,6 +167,26 @@ const openForm = (type: string, row?: any) => {
   }
   basicFormRef.value.open(type, row)
 }
+const onEnter = async (field,value)=>{
+  console.log('onEnter',field,value)
+  if('defaultLocationCode'==field){
+    //物料代码
+    basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+
+  }
+}
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -52,6 +52,7 @@
     :apiCreate="ItempackagingApi.createItempackaging"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -75,6 +76,10 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
 
 defineOptions({ name: 'Itempackaging' })
 
@@ -205,6 +210,41 @@ const formsSuccess = async (formType, data) => {
   basicFormRef.value.dialogVisible = false
   getList()
 }
+const onEnter = async (field,value)=>{
+  console.log('onEnter',field,value)
+  if('itemCode'==field){
+    //物料代码
+    basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+
+  }else if('packUnit'==field){
+    //包装规格
+    basicFormRef.value.opensearchTable('packUnit', 'code', '包装规格信息', Packageunit.allSchemas, PackageunitApi.getPackageunitPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {

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

@@ -23,6 +23,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -64,6 +65,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段

src/views/wms/basicDataManage/orderManage/shift/shift.data.ts

@@ -34,7 +34,7 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'HH:mm:ss'
     },
-    sort: 'custom', 
+    sort: 'custom',
     table: {
       width: 180,
     },
@@ -47,9 +47,9 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isSearch: true,
+    isSearch: false,
     search: {
-      show: true,
+      show: false,
       component: 'TimePicker',
       componentProps: {
         valueFormat: 'HH:mm:ss',
@@ -78,9 +78,9 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isSearch: true,
+    isSearch: false,
     search: {
-      show: true,
+      show: false,
       component: 'TimePicker',
       componentProps: {
         valueFormat: 'HH:mm:ss',
@@ -249,4 +249,4 @@ export const ShiftRules = reactive({
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
-})
+})

src/views/wms/basicDataManage/orderManage/team/team.data.ts

@@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     form: {
       component: 'Switch',

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -9,13 +9,14 @@
         label-width="120px"
         label-position="left"
       >
+
         <!-- 规则 -->
         <div class="item">
           <div class="title">规则</div>
           <el-row gutter="10">
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
-                <el-input
+                <el-input key="strategyCode"
                   v-model="formData.strategyCode"
                   placeholder="请输入代码"
                   clearable
@@ -25,22 +26,22 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="0" />
+                <el-input-number key="priority" v-model="formData.priority" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -48,13 +49,13 @@
 
         <!-- 规则条件 -->
 
-        <div class="item mt-20px">
+        <div key="规则条件" class="item mt-20px">
-          <div class="title">规则条件</div>
+          <div key="规则条件title" class="title">规则条件</div>
-          <el-row gutter="10">
+          <el-row key="规则条件row" :gutter="10">
-            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+            <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择供应商和客户 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
+              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">
-                <el-select
+                <el-select key="供应商和客户"
                   v-model="item.ParamCode"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
@@ -64,10 +65,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="(cur, index) in options.typeOptions"
-                    :key="index"
+                    :key="'供应商和客户'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商和客户Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -76,28 +77,30 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'供应商和客户Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商和客户Value"
                   v-model="item.Value"
                   :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
                   style="flex: 1"
                   clearable
                   multiple
                   collapse-tags
+                  filterable
+                  :filter-method="filterMethod"
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.code"
+                    :key="'供应商和客户Value'+cur.code"
                     :label="cur.name"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 选择物料类型 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
+              <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
-                <el-select
+                <el-select key="物料类型"
                   v-model="item.ParamCode"
                   placeholder=""
                   @change="changeItemsType"
@@ -107,10 +110,10 @@
                     :label="item.label"
                     :value="item.value"
                     v-for="item in options.itemTypeOptions"
-                    :key="item.value"
+                    :key="'物料类型'+item.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="物料类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -119,10 +122,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'物料类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="物料类型Value"
                   v-model="item.Value"
                   placeholder="请选择物料类型"
                   style="flex: 1"
@@ -133,12 +136,12 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
-                    :key="cur.value"
+                    :key="'物料类型Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="ABC类"
                   v-model="item.Value"
                   placeholder="请选择ABC类"
                   style="flex: 1"
@@ -149,26 +152,26 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
-                    :key="cur.value"
+                    :key="'ABC类'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="物料分组"
                   v-model="item.Value"
                   placeholder="请输入物料分组，多个物料分组以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'ItemGroup'"
                 />
-                <el-input
+                <el-input key="项目"
                   v-model="item.Value"
                   placeholder="请输入项目，多个项目以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'Project'"
                 />
-                <el-input
+                <el-input key="物料"
                   v-model="item.Value"
                   placeholder="请输入物料，多个物料以逗号分隔"
                   clearable
@@ -177,8 +180,8 @@
                 />
               </el-form-item>
               <!-- 选择重量体积还是面积 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
+              <el-form-item key="重量体积或面积formItem" label="" label-width="0" class="err-240" v-if="index == 2">
-                <el-select
+                <el-select key="重量体积或面积"
                   v-model="item.ParamCode"
                   placeholder=""
                   @change="changeCalculation"
@@ -188,10 +191,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.calculationTypeOptions"
-                    :key="cur.value"
+                    :key="'重量体积或面积'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="重量体积或面积Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -200,10 +203,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions2"
-                    :key="cur.value"
+                    :key="'重量体积或面积Operator'+cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="重量体积或面积Value"
                   v-model="item.Value"
                   :placeholder="`请输入${
                     item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
@@ -213,8 +216,8 @@
                 />
               </el-form-item>
               <!-- 库存状态 -->
-              <el-form-item label="库存状态" class="err-120" v-if="index == 3">
+              <el-form-item key="库存状态formItem" label="库存状态" class="err-120" v-if="index == 3">
-                <el-select
+                <el-select key="库存状态Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -223,10 +226,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'库存状态Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="库存状态Value"
                   v-model="item.Value"
                   placeholder="请选择库存状态"
                   style="flex: 1"
@@ -236,15 +239,15 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
-                    :key="cur.value"
+                    :key="'库存状态Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
               </el-form-item>
               <!-- 存储类型 -->
-              <el-form-item label="存储类型" class="err-120" v-if="index == 4">
+              <el-form-item key="存储类型formItem" label="存储类型" class="err-120" v-if="index == 4">
-                <el-select
+                <el-select key="存储类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -253,10 +256,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'存储类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="存储类型Value"
                   v-model="item.Value"
                   placeholder="请选择存储类型"
                   style="flex: 1"
@@ -266,15 +269,15 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                    :key="cur.value"
+                    :key="'存储类型Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
               </el-form-item>
               <!-- 库存事务 -->
-              <el-form-item label="库存事务" class="err-120" v-if="index == 5">
+              <el-form-item key="库存事务formItem" label="库存事务" class="err-120" v-if="index == 5">
-                <el-select
+                <el-select key="库存事务Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -283,10 +286,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'库存事务Operator'+cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="库存事务Value"
                   v-model="item.Value"
                   placeholder="请输入库存事务，多个库存事务以逗号分隔"
                   clearable
@@ -298,12 +301,12 @@
         </div>
 
         <!-- 规则配置 -->
-        <div class="item mt-20px">
+        <div key="规则配置" class="item mt-20px">
-          <div class="title">规则配置</div>
+          <div key="规则配置title" class="title">规则配置</div>
-          <el-row gutter="10">
+          <el-row key="规则配置row" :gutter="10">
-            <el-col :span="24">
+            <el-col key="仓库col" :span="24">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
+              <el-form-item key="仓库formItem" label="" label-width="0" prop="warehouse" class="err-120">
-                <el-select
+                <el-select key="仓库"
                   v-model="warehouseType"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
@@ -313,19 +316,22 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="(cur, index) in options.warehouseTypeOptions"
-                    :key="index"
+                    :key="'仓库'+cur.value"
                   />
                 </el-select>
                 <el-select
                   v-model="formData.configuration.WarehouseCode"
                   v-if="warehouseType == 'WarehouseCode'"
                   placeholder="请选择仓库"
+                  key="请选择仓库"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择仓库WarehouseCode'+index+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -334,12 +340,15 @@
                   v-model="formData.configuration.AreaCode"
                   v-if="warehouseType == 'AreaCode'"
                   placeholder="请选择库区"
+                  key="请选择库区"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库区AreaCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -348,12 +357,15 @@
                   v-model="formData.configuration.LocationGroupCode"
                   v-if="warehouseType == 'LocationGroupCode'"
                   placeholder="请选择库位组"
+                  key="请选择库位组"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库位组LocationGroupCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -363,12 +375,15 @@
                   v-model="formData.configuration.LocationCode"
                   v-if="warehouseType == 'LocationCode'"
                   placeholder="请选择库位"
+                  key="请选择库位"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库位LocationCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -376,14 +391,14 @@
               </el-form-item>
             </el-col>
             <!-- 数量排序方向 -->
-            <el-col :span="24">
+            <el-col key="数量排序方向col" :span="24">
-              <el-form-item label="数量排序方向" class="flex-top">
+              <el-form-item key="数量排序方向formItem" label="数量排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.QtyOrderDirection">
+                  <el-radio-group key="数量排序方向" v-model="formData.configuration.QtyOrderDirection">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'数量排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -391,14 +406,14 @@
               </el-form-item>
             </el-col>
             <!-- 巷道排序方向 -->
-            <el-col :span="24">
+            <el-col key="巷道排序方向col" :span="24">
-              <el-form-item label="巷道排序方向" class="flex-top">
+              <el-form-item key="巷道排序方向formItem" label="巷道排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                  <el-radio-group key="巷道排序方向" v-model="formData.configuration.AisleOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'巷道排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -406,14 +421,14 @@
               </el-form-item>
             </el-col>
             <!-- 货架排序方向 -->
-            <el-col :span="24">
+            <el-col key="货架排序方向col" :span="24">
-              <el-form-item label="货架排序方向" class="flex-top">
+              <el-form-item key="货架排序方向formItem" label="货架排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                  <el-radio-group key="货架排序方向" v-model="formData.configuration.ShelfOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'货架排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -421,14 +436,14 @@
               </el-form-item>
             </el-col>
             <!-- 行排序方向 -->
-            <el-col :span="24">
+            <el-col key="行排序方向col" :span="24">
-              <el-form-item label="行排序方向" class="flex-top">
+              <el-form-item key="行排序方向formItem" label="行排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.RowOrder">
+                  <el-radio-group  key="行排序方向" v-model="formData.configuration.RowOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'行排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -436,14 +451,14 @@
               </el-form-item>
             </el-col>
             <!-- 列排序方向 -->
-            <el-col :span="24">
+            <el-col key="列排序方向col" :span="24">
-              <el-form-item label="列排序方向" class="flex-top">
+              <el-form-item key="列排序方向formItem" label="列排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                  <el-radio-group key="列排序方向" v-model="formData.configuration.ColumOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'列排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -452,8 +467,8 @@
             </el-col>
             <!-- 优先整包 -->
             <el-col :span="24">
-              <el-form-item label="优先整包">
+              <el-form-item key="优先整包formItem" label="优先整包">
-                <el-switch
+                <el-switch key="优先整包"
                   v-model="formData.configuration.EntirePackageFirst"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -461,14 +476,14 @@
               </el-form-item>
             </el-col>
             <!-- 发料包装类型 -->
-            <el-col :span="24">
+            <el-col key="发料包装类型col" :span="24">
-              <el-form-item label="发料包装类型">
+              <el-form-item key="发料包装类型formItem" label="发料包装类型">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.IssueStorageType">
+                  <el-radio-group key="发料包装类型" v-model="formData.configuration.IssueStorageType">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                      :key="cur.value"
+                      :key="'发料包装类型'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -476,9 +491,9 @@
               </el-form-item>
             </el-col>
             <!-- 多次发料 -->
-            <el-col :span="7">
+            <el-col key="多次发料col" :span="7">
-              <el-form-item label="多次发料">
+              <el-form-item key="多次发料formItem" label="多次发料">
-                <el-switch
+                <el-switch  key="多次发料"
                   v-model="formData.configuration.IsSplit"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -486,9 +501,9 @@
               </el-form-item>
             </el-col>
             <!-- 拆分次数 -->
-            <el-col :span="8">
+            <el-col key="拆分次数col" :span="8">
-              <el-form-item label="拆分次数" label-width="70px">
+              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">
-                <el-input-number
+                <el-input-number key="拆分次数"
                   v-model="formData.configuration.EachTimeQty"
                   :min="0"
                   controls-position="right"
@@ -496,9 +511,9 @@
               </el-form-item>
             </el-col>
             <!-- 时间间隔 -->
-            <el-col :span="9">
+            <el-col key="时间间隔col" :span="9">
-              <el-form-item label="时间间隔" label-width="70px">
+              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">
-                <el-input-number
+                <el-input-number key="时间间隔"
                   v-model="formData.configuration.TimeInterval"
                   :min="0"
                   style="flex: 1; margin-right: 10px"
@@ -507,9 +522,9 @@
               </el-form-item>
             </el-col>
             <!-- 使用整理库位-->
-            <el-col :span="24">
+            <el-col key="使用整理库位col" :span="24">
-              <el-form-item label="使用整理库位">
+              <el-form-item key="使用整理库位formItem" label="使用整理库位">
-                <el-switch
+                <el-switch key="使用整理库位"
                   v-model="formData.configuration.UseOrganizeLocation"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -517,9 +532,9 @@
               </el-form-item>
             </el-col>
             <!-- 使用在途库位 -->
-            <el-col :span="24">
+            <el-col key="使用在途库位col" :span="24">
-              <el-form-item label="使用在途库位">
+              <el-form-item key="使用在途库位formItem"  label="使用在途库位">
-                <el-switch
+                <el-switch key="使用在途库位"
                   v-model="formData.configuration.UseTransportLocation"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -527,9 +542,9 @@
               </el-form-item>
             </el-col>
             <!-- 生成接收任务 -->
-            <el-col :span="24">
+            <el-col key="生成接收任务col" :span="24">
-              <el-form-item label="生成接收任务">
+              <el-form-item key="生成接收任务formItem" label="生成接收任务">
-                <el-switch
+                <el-switch key="生成接收任务"
                   v-model="formData.configuration.CreateReceiptJob"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -672,6 +687,7 @@ const options = reactive({
   ],
   //供应商列表
   supplierList: [],
+  originSupplierList: [],
   // 物料类型列表
   itemTypeOptions: [
     { value: 'ItemType', label: '物料类型' },
@@ -694,6 +710,7 @@ const options = reactive({
     { value: 'LocationCode', label: '库位' }
   ],
   warehouseList: [],
+  originWarehouseList: [],
   // 排列方式
   sortOptions: [
     { value: 'ASC', label: '从小到大' },
@@ -719,11 +736,26 @@ const buttonBaseClick = (val, item) => {
 
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.supplierList = await getSupplierList()
+  options.originSupplierList = await getSupplierList(null)
+  options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
-  options.supplierList = await getCustomerList()
+  options.originSupplierList = await getCustomerList(null)
+  options.supplierList = [...options.originSupplierList]
+}
+const filterMethod = (query: string) => {
+  if (query) {
+    options.supplierList = options.originSupplierList.filter((item) => {
+      if(!item.name||item.name==''){
+        return item.code.includes(query)
+      }else{
+        return item.name.includes(query)
+      }
+    })
+  } else {
+    options.supplierList = [...options.originSupplierList]
+  }
 }
 // 选择客户还是承运商
 const changeSupplierCustomer = (e) => {
@@ -745,21 +777,66 @@ const changeCalculation = () => {
 }
 // 获取仓库列表
 const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getWarehouseList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库区列表
 const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getAreaList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库位组列表
 const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getLocationgroupList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.warehouseList = await getLocationList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList =  await getLocationList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+const filterMethodWarehouseList = (query: string) => {
+  if (query) {
+    options.warehouseList = options.originWarehouseList.filter((item) => {
+      return item.code.includes(query)
+    })
+  } else {
+    options.warehouseList = options.originWarehouseList
+  }
 }
-getFormLocationList()
+getFormWarehouseList()
 // 选择仓库/库位/库位组/库区
 const changeWarehouse = (e) => {
   formData.value.configuration.WarehouseCode = ''

src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@@ -152,6 +152,15 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isForm: false,
   },
   {

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

@@ -24,15 +24,15 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
+  // {
-    label: '盘点记录单号',
+  //   label: '盘点记录单号',
-    field: 'countRecordNumber',
+  //   field: 'countRecordNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    isSearch: true
+  //   isSearch: true
-  },
+  // },
   {
     label: '仓库代码',
     field: 'warehouseCode',
@@ -214,7 +214,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     form: {
       component: 'Switch',

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

@@ -55,16 +55,16 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     },
 
   },
-  {
+  // {
-    label: '申请单号',
+  //   label: '申请单号',
-    field: 'requestNumber',
+  //   field: 'requestNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isSearch: true,
+  //   isSearch: true,
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '盘点记录单号',
     field: 'countRecordNumber',

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

@@ -421,6 +421,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    isTable: false,
+    isForm: false,
     table: {
       width: 180,
       fixed: 'left'
@@ -717,6 +719,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'action',
     isDetail: false,
     isForm: false ,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
@@ -745,4 +748,4 @@ export const CustomersettleRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
+})

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

@@ -39,7 +39,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
   },
   // {
   //   label: '发货计划单号',
@@ -62,7 +62,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     isForm: false,
     sort: 'custom',
@@ -366,7 +366,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

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

@@ -559,6 +559,10 @@ const importSuccess = () => {
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
   let filters = [...searchData.filters]
   if(!filters.find(item=>item.column=='business_type')){
     if ( routeName.value == 'DeliverRequestMain') {

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

@@ -256,7 +256,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

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

@@ -249,7 +249,7 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -219,6 +219,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -507,4 +510,4 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
     isTableForm:false,
   }
-]))
+]))

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

@@ -165,6 +165,9 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -186,6 +189,9 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isSearch: false,
     isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -212,6 +218,9 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isSearch: false,
     isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -238,6 +247,9 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isSearch: false,
     isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -489,7 +501,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    hiddenInMain: true 
+    hiddenInMain: true
   },
   // {
   //   label: '包装号',
@@ -508,7 +520,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //     searchCondition: [
   //     //   {
   //     //   key:'customerCode', // 查询列表中字段
-  //     //   value:'customerCode', // 指主表某字段 
+  //     //   value:'customerCode', // 指主表某字段
   //     //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
   //     //   isMainValue: true // 表示查询条件是主表的字段的值
   //     // }
@@ -526,7 +538,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //       searchCondition: [
   //       //   {
   //       //   key:'customerCode', // 查询列表中字段
-  //       //   value:'customerCode', // 指主表某字段 
+  //       //   value:'customerCode', // 指主表某字段
   //       //   message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
   //       //   isMainValue: true // 表示查询条件是主表的字段的值
   //       // }
@@ -633,7 +645,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 120
     },
-    hiddenInMain: true 
+    hiddenInMain: true
   },
   {
     label: '物品描述2',
@@ -644,7 +656,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 120
     },
-    hiddenInMain: true 
+    hiddenInMain: true
   },
   {
     label: '项目代码',
@@ -655,7 +667,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 120
     },
-    hiddenInMain: true 
+    hiddenInMain: true
   },
   {
     label: '数量',

src/views/wms/inventoryManage/balance/index.vue

@@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
   })
   console.log('批量打印',rows.join(','))
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
   PackageApi.getBalanceToPackageSelection(rows).then(res => {
     console.log('res',res);
+    getLoading?.close()
     if(res.zzLabel){
       //制造标签
       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
@@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{
     
   }).catch(err => {
     console.log(err)
+    getLoading?.close()
   })
   // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
 }

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

@@ -20,7 +20,7 @@ export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
     label: '已用容量百分比',
     field: 'usedCapacity',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '可用容量百分比',

src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts

@@ -95,7 +95,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable: false
   },
   {

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts

@@ -99,7 +99,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable:false,
   },
   {

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts

@@ -95,7 +95,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable: false
   },
   {

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

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...InventoryinitRecordMain.allSchemas.searchSchema,...InventoryinitRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InventoryinitRecordMain.allSchemas.searchSchema,...InventoryinitRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -17,7 +17,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,6 +28,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -68,6 +70,8 @@ import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
 import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getAccessToken } from '@/utils/auth'
+
 // 库存初始化记录主
 defineOptions({ name: 'InventoryinitRecordMain' })
 
@@ -94,6 +98,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-record-main:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -120,6 +125,8 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
@@ -171,7 +178,58 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  console.log('批量打印',rows.join(','))
+  let getLoading = ElLoading.service({
+    lock: true,
+    text: 'loading...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  })
+  InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => {
+    console.log('批量打印res',res);
+    getLoading?.close()
+    if(res.zzLabel){
+      //制造标签
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+    if (res.cgLabel) {
+      //采购标签
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.cgLabel)
+    }
+    if(!res.cgLabel&&!res.zzLabel){
+      message.error('包装不存在，无法打印')
+    }
+  }).catch(err => {
+    console.log(err)
+    getLoading?.close()
+  })
 
+}
 /** 初始化 **/
 onMounted(async () => {
   getList()

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

@@ -211,7 +211,7 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

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

@@ -109,7 +109,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['uom'] = val[0]['uom']
+      if(formField=='itemCode'){
+        //物料代码
+        row['uom'] = val[0]['uom']
+      }else if(formField=='packUnit'){
+        //包装规格1
+        row['packQty'] = val[0]['packQty']
+      }else if(formField=='secondPackUnit'){
+        //包装规格2
+        row['secondPackQty'] = val[0]['packQty']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

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

@@ -14,6 +14,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 import * as OwnerApi  from '@/api/wms/owner'
 import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -747,6 +750,197 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       valueFormat: 'x',
     }
   },
+ 
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'itemCode',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      }
+    },
+    tableForm: {
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      clearable: true,
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      }
+    },
+    tableForm: {
+    }
+  },
+  {
+    label: '入库存包装规格',
+    field: 'balancePackUnit',
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'itemCode',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true,
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -869,4 +1063,10 @@ export const InventoryinitRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+  packUnit:[
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  balancePackUnit:[
+    { required: true, message: '请选择入库存包装规格', trigger: 'change' }
+  ],
+})

src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts

@@ -154,7 +154,7 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@@ -867,6 +867,14 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isTableForm: false,
   },
   {

src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts

@@ -155,7 +155,7 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -234,7 +234,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     form: {
       component: 'Switch',

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts

@@ -263,7 +263,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts

@@ -292,7 +292,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts

@@ -300,7 +300,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@@ -281,7 +281,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -252,7 +252,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -451,7 +451,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 200,
+      width: 230,
       fixed: 'right'
     },
   },
@@ -579,7 +579,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'packingNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
     sortSearchDefault:4,
@@ -846,7 +846,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 300
     },
     sortTableDefault:4,
     isTableForm: false,

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -1,42 +1,45 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 
 import * as ProductionMainApi from '@/api/wms/productionMain'
-import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
+import {
+  ProductionMain
+} from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
 
 import * as WorkshopApi from '@/api/wms/workshop'
-import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+import {Workshop} from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
-import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import {
+  Productionline
+} from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
 import * as ShiftApi from '@/api/wms/shift'
-import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
+import {Shift} from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
 
 import * as TeamApi from '@/api/wms/team'
-import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
+import {Team} from '@/views/wms/basicDataManage/orderManage/team/team.data'
 
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 // import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
-
 // import * as BomApi from '@/api/wms/bom'
-import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+import {Bom} from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
 import * as WorkStationApi from '@/api/wms/workstation'
-import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+import {Workstation} from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
-import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+import * as getPlansettingApi from '@/api/wms/plansetting/index'
 
-const { t } = useI18n() // 国际化
+const {t} = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
+  pageSize: 10,
-  pageNo:1,
+  pageNo: 1,
-  code:'PreparetoissuePlan'
+  code: 'PreparetoissuePlan'
 }
- const data = await getPlansettingApi.getPlansettingPage(queryParams)
+const data = await getPlansettingApi.getPlansettingPage(queryParams)
- const plansettingData =data?.list[0]||{}
+const plansettingData = data?.list[0] || {}
 
 /**
  * @returns {Array} 备料计划主表
@@ -63,7 +66,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
-    isForm:false,
+    isForm: false,
     form: {
       value: '1',
       componentProps: {
@@ -182,7 +185,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -203,7 +206,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -228,14 +231,20 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
         searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'status',
+          key: 'status',
-          value:'6',
+          value: '6',
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
           isMainValue: false
-        },{
+        },
-          key:'available',
+        {//备料计划>新增 生产计划单号选择：page 和 senior 查询条件不一致 senior 生产计划信息 searchCondition 添加查询条件 planType = predict
-          value:'TRUE',
+          key: 'planType',
+          value: 'predict',
           isMainValue: false
-        }] 
+        }]
       }
     }
   },
@@ -253,7 +262,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {
@@ -290,7 +299,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,7 +320,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -332,7 +341,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -362,7 +371,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -395,7 +404,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -428,31 +437,31 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PreparetoissueMainRules = reactive({
   workshop: [
-    { required: true, message: '请选择车间', trigger: 'change' }
+    {required: true, message: '请选择车间', trigger: 'change'}
   ],
   prodLine: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
+    {required: true, message: '请选择生产线', trigger: 'change'}
   ],
   shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
+    {required: true, message: '请选择班次', trigger: 'change'}
   ],
   team: [
-    { required: true, message: '请选择班组', trigger: 'change' }
+    {required: true, message: '请选择班组', trigger: 'change'}
   ],
   planDate: [
-    { required: true, message: '请输入计划日期', trigger: 'change' }
+    {required: true, message: '请输入计划日期', trigger: 'change'}
   ],
   available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    {required: true, message: '请选择是否可用', trigger: 'change'}
   ],
   status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
+    {required: true, message: '请选择状态', trigger: 'change'}
   ],
   businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+    {required: true, message: '请输入业务类型', trigger: 'blur'}
   ],
-  remark:  [
+  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    {max: 50, message: '不得超过50个字符', trigger: 'blur'}
   ],
 })
 
@@ -477,44 +486,44 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
         searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'productionLineCode',
+          key: 'productionLineCode',
-          value:'prodLine',
+          value: 'prodLine',
           message: '请填写生产线代码！',
           isMainValue: true
-        },{
+        }, {
-          key:'workshopCode',
+          key: 'workshopCode',
-          value:'workshop',
+          value: 'workshop',
           message: '请填写车间代码！',
           isMainValue: true
-        },{
+        }, {
-          key:'available',
+          key: 'available',
-          value:'TRUE',
+          value: 'TRUE',
           isMainValue: false
-        }] 
+        }]
       }
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+      searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
+      searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
+      searchCondition: [{
-          key:'productionLineCode',
+        key: 'productionLineCode',
-          value:'prodLine',
+        value: 'prodLine',
-          message: '请填写生产线代码！',
+        message: '请填写生产线代码！',
-          isMainValue: true
+        isMainValue: true
-        },{
+      }, {
-          key:'workshopCode',
+        key: 'workshopCode',
-          value:'workshop',
+        value: 'workshop',
-          message: '请填写车间代码！',
+        message: '请填写车间代码！',
-          isMainValue: true
+        isMainValue: true
-        },{
+      }, {
-          key:'available',
+        key: 'available',
-          value:'TRUE',
+        value: 'TRUE',
-          isMainValue: false
+        isMainValue: false
-        }] 
+      }]
     },
   },
   {
@@ -534,14 +543,14 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
         searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'productionLineCode',
+          key: 'productionLineCode',
-          value:'prodLine',
+          value: 'prodLine',
           message: '请填写生产线代码！',
           isMainValue: true
         }]
       }
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
@@ -549,11 +558,11 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPageByItemtype, // 查询弹窗所需分页方法
       searchCondition: [{
-        key:'productionLineCode',
+        key: 'productionLineCode',
-        value:'prodLine',
+        value: 'prodLine',
         message: '请填写生产线代码！',
         isMainValue: true
-      }] 
+      }]
     },
   },
   {
@@ -566,7 +575,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
     },
-    tableForm:{
+    tableForm: {
       type: 'InputNumber',
       min: 1,
       precision: 6
@@ -589,7 +598,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       type: 'Select',
       disabled: true
     },
@@ -607,11 +616,11 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
-    tableForm:{
+    tableForm: {
       disabled: true
     },
   },
-  
+
   {
     label: '截止时间',
     field: 'dueTime',
@@ -632,7 +641,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -678,7 +687,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -724,7 +733,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
+        style: {width: '100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -738,14 +747,14 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain: true,
-    tableForm:{
+    tableForm: {
       type: 'Select',
       default: 'TRUE'
     },
@@ -760,42 +769,42 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '操作',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'action',
     isDetail: false,
-    isForm: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))
 
 //表单校验
 export const PreparetoissueDetailRules = reactive({
   available: [
-    { required: true, message: '请选择是否可用', trigger: 'blur' }
+    {required: true, message: '请选择是否可用', trigger: 'blur'}
   ],
   uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
+    {required: true, message: '请选择计量单位', trigger: 'change'}
   ],
   planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' }
+    {required: true, message: '请输入计划数量', trigger: 'blur'}
   ],
   number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+    {required: true, message: '请输入单据号', trigger: 'blur'}
   ],
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    {required: true, message: '请选择物料代码', trigger: 'change'}
   ],
   workStation: [
-    { required: true, message: '请选择工位', trigger: 'change' }
+    {required: true, message: '请选择工位', trigger: 'change'}
   ],
-  remark:  [
+  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    {max: 50, message: '不得超过50个字符', trigger: 'blur'}
   ],
-  dueTime:  [
+  dueTime: [
-    { required: true, message: '请选择截止时间', trigger: 'change' }
+    {required: true, message: '请选择截止时间', trigger: 'change'}
   ]
 })

src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts

@@ -257,7 +257,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  
+
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -402,7 +402,7 @@ export const ProductionreceiptRecordMainRules = reactive({
  */
 export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
+    label: '包装号',
     field: 'fromPackingNumber',
     sort: 'custom',
     table: {
@@ -418,7 +418,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -596,7 +596,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     sortSearchDefault:2,
     sortTableDefault:4,
   },
-  
+
   {
     label: '物料名称',
     field: 'itemName',
@@ -746,7 +746,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     isTable: false,
     hiddenInMain:true,
   },
-  
+
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
@@ -755,9 +755,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
   //     width: 150
   //   },
   // },
-  
+
-  
+
-  
+
 ]))
 
 //表单校验
@@ -807,4 +807,4 @@ export const ProductionreceiptRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -205,7 +205,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@@ -272,7 +272,7 @@ onMounted(async () => {
   if(routeName.value == "InventorymoveRecordMain"){
     importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
   }else {
-    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+    //importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
   }
 })
 </script>

src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
@@ -289,7 +289,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }], 
+      }],
     },
   },
   {
@@ -456,6 +456,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     label: '生效日期',
     field: 'effectiveDate',
     sort: 'custom',
+    formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
@@ -625,4 +626,4 @@ export const ProcessproductionRequestDetailRules = reactive({
   effectiveDate:[
     { required: true, message: '请输入生效日期', trigger: 'change' }
   ],
-})
+})

src/views/wms/productionManage/productionplan/qadproductionplan/index.vue

@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: QadProductionPlanMainApi.getQadProductionPlanMainPage // 分页接口
+  getListApi: QadProductionPlanMainApi.getQadProductionPlanDetailPage // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const QadProductionPlanMainRules = reactive({
@@ -9,35 +9,31 @@ export const QadProductionPlanMainRules = reactive({
 })
 
 export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '顺序',
-    field: 'displayOrder',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    table: {
+      width: 350,
+    }
   },
   {
-    label: '车间',
+    label: '物料代码',
-    field: 'workshop',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150,
+    }
   },
   {
-    label: '生产线',
+    label: '计划数量',
-    field: 'productionLine',
+    field: 'planQty',
     sort: 'custom',
-    isSearch: true,
   },
   {
-    label: '班次',
+    label: '生产线',
-    field: 'shift',
+    field: 'productionLine',
     sort: 'custom',
     isSearch: true,
   },
@@ -50,7 +46,7 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划日期',
     field: 'planDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -59,11 +55,6 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '明细列表',
-    field: 'details',
-    sort: 'custom',
-  },
   {
     label: '计划类型',
     field: 'planType',
@@ -80,33 +71,33 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'SelectV2'
     },
   },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
-  {
+  // {
-    label: '是否可用',
+  //   label: '是否可用',
-    field: 'available',
+  //   field: 'available',
-    sort: 'custom',
+  //   sort: 'custom',
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
-  {
+  // {
-    label: '状态',
+  //   label: '状态',
-    field: 'status',
+  //   field: 'status',
-    sort: 'custom',
+  //   sort: 'custom',
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
-  {
+  // {
-    label: '订单号',
+  //   label: '订单号',
-    field: 'woNumber',
+  //   field: 'woNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
-  {
+  // {
-    label: '订单行',
+  //   label: '订单行',
-    field: 'woLine',
+  //   field: 'woLine',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
   // {
   //   label: '操作',
   //   field: 'action',

src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@@ -77,8 +77,8 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/productputaway-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/productputaway-request-main/import" :importTemplateData="importTemplateData"
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
 </template>
 
 <script setup lang="ts">

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -124,7 +124,7 @@
   <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
 </template>
 
 <script setup lang="ts">
@@ -200,6 +200,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      }else if(formField == 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
@@ -614,18 +617,17 @@ const searchFormClick = (searchData) => {
 // 创建标签
 const submitFormLabel = async (formType, data) => {
   try {
-    detatableData.tableList.forEach(async (item) => {
+    console.log("aaaaa",data);
-      // 创建标签 要物料库区配置表中 入库包装规格
+    data.subList=detatableData.tableList
-      item.packUnit = null
+    console.log("bbbbb",data);
-      item.inOfOut = 'in'
+    // 创建标签 要物料库区配置表中 入库包装规格
-      await PackageApi.createPackageLabel(item).then(res => {
+    await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
-        isCreateLabel.value = true
+      isCreateLabel.value = true
-        message.success('创建标签成功')
+      message.success('创建标签成功')
-      }).catch(err => {
+    }).catch(err => {
-        isCreateLabel.value = false
+      isCreateLabel.value = false
-        console.log(err)
+      console.log(err)
-        message.error('创建标签失败')
+      message.error('创建标签失败')
-      })
     })
   } finally {
     formLabelRef.value.formLoading = false
@@ -717,7 +719,7 @@ const labelPrint = async (row) => {
 }
 
 // 批量打印--预生产收货
-const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
   // let rows:any = []
   // val.forEach(item=>{

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1781,10 +1781,51 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'packUnit',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
     },
     tableForm: {
-      disabled: true
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
     },
   },
   {
@@ -1806,7 +1847,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格2',
     field: 'secondPackUnit',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150,

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -201,6 +201,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      }else if(formField == 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
@@ -616,18 +619,16 @@ const searchFormClick = (searchData) => {
 // 创建标签
 const submitFormLabel = async (formType, data) => {
   try {
-    detatableData.tableList.forEach(async (item) => {
+    console.log("aaaaa",data);
-      // 创建标签 要物料库区配置表中 入库包装规格
+    data.subList=detatableData.tableList
-      item.packUnit = null
+    console.log("bbbbb",data);
-      item.inOfOut = 'in'
+    await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
-      await PackageApi.createPackageLabel(item).then(res => {
+      isCreateLabel.value = true
-        isCreateLabel.value = true
+      message.success('创建标签成功')
-        message.success('创建标签成功')
+    }).catch(err => {
-      }).catch(err => {
+      isCreateLabel.value = false
-        isCreateLabel.value = false
+      console.log(err)
-        console.log(err)
+      message.error('创建标签失败')
-        message.error('创建标签失败')
-      })
     })
   } finally {
     formLabelRef.value.formLoading = false

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -1781,11 +1781,52 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'packUnit',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
     },
     tableForm: {
-      disabled: true
+      disabled: true,
-    },
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
   },
   {
     label: '包装数量1',
@@ -1806,7 +1847,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格2',
     field: 'secondPackUnit',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150,

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@@ -796,6 +796,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     sortTableDefault:9,
     tableForm: {
+      disabled:true,
       type: 'InputNumber',
       min: 1,
       precision: 6

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PurchaseMain.allSchemas.searchSchema,...PurchaseDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchaseMain.allSchemas.searchSchema,...PurchaseDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -9,10 +9,12 @@
     @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" :detailAllSchemas="PurchaseDetail.allSchemas" />
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable ref="elTableRef"  :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table v-clientTable ref="elTableRef"
+    :selection="true"
+    :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort" >
+      v-model:sort="tableObject.sort" @getSelectionRows="getSelectionRows">
     <!-- <Table ref="elTableRef"  :expand="true" :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
@@ -227,6 +229,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出
+    defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -256,6 +259,8 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
     } else {
       getList()
     }
+    } else if (val=='mainOrderSelectionPub'){// 批量发布
+      handleSelectionPublish()
     } else if (val == 'filtrate') { // 筛选
     } else { // 其他按钮
       console.log('其他按钮', item)
@@ -403,7 +408,44 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
       tableObject.loading = false
     }
   }
-
+  const searchList = (model)=>{
+    selectionRows.value = []
+    setSearchParams(model)
+  }
+  const selectionRows = ref<any>([])
+  const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+    console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+    const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+    if(currentRows){
+      currentRows.selectionRows = currentPageSelectionRows
+    }else{
+      selectionRows.value.push({
+        currentPage,
+        selectionRows:currentPageSelectionRows
+      })
+    }
+  }
+  // 批量发布
+  const handleSelectionPublish = async ()=>{
+  // 发布的二次确认
+  await message.confirm(t('ts.是否发布所选中数据？'))
+  tableObject.loading = true
+  let rows:any = []
+  selectionRows.value.map(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
+  })
+  tableObject.loading = true
+  Promise.all( rows.map(item=>PurchaseMainApi.publishPurchaseMain(item))).then((res) => {
+    console.log('发布',res)
+    if(res.every(item=>item==true)){
+      message.success(t('ts.发布成功!'))
+    }
+  }).finally(()=>{
+    tableObject.loading = false
+    // 刷新列表
+    getList()
+  })
+}
   /** 发布按钮操作 */
   const handlePublish = async (id : number) => {
     try {

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -11,10 +11,17 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table ref="tableRef" v-clientTable 
+    :selection="true"
+    :columns="tableColumns" 
+    :data="tableObject.tableList" 
+    :loading="tableObject.loading" 
+    :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      }" 
-      v-model:sort="tableObject.sort">
+      v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows">
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -241,6 +248,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
+    defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -271,6 +279,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
     } else {
       getList()
     }
+    } else if (val=='mainOrderSelectionPub'){// 批量发布
+      handleSelectionPublish()
     } else if (val == 'filtrate') { // 筛选
     } else { // 其他按钮
       console.log('其他按钮', item)
@@ -433,7 +443,45 @@ const { wsCache } = useCache()
       tableObject.loading = false
     }
   }
-
+  const searchList = (model)=>{
+    selectionRows.value = []
+    setSearchParams(model)
+  }
+  const selectionRows = ref<any>([])
+  const tableRef = ref()
+  const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+    console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+    const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+    if(currentRows){
+      currentRows.selectionRows = currentPageSelectionRows
+    }else{
+      selectionRows.value.push({
+        currentPage,
+        selectionRows:currentPageSelectionRows
+      })
+    }
+  }
+  // 批量发布
+const handleSelectionPublish = async ()=>{
+  // 发布的二次确认
+  await message.confirm(t('ts.是否发布所选中数据？'))
+  tableObject.loading = true
+  let rows:any = []
+  selectionRows.value.map(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
+  })
+  tableObject.loading = true
+  Promise.all( rows.map(item=>PurchasePlanMainApi.publishPurchasePlanMain(item))).then((res) => {
+    console.log('发布',res)
+    if(res.every(item=>item==true)){
+      message.success(t('ts.发布成功!'))
+    }
+  }).finally(()=>{
+    tableObject.loading = false
+    // 刷新列表
+    getList()
+  })
+}
   /** 发布按钮操作 */
   const handlePublish = async (id : number) => {
     try {

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -110,6 +110,26 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  //仅是主列表页面的筛选搜索条件
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
   {
     label: '送达日期',
     field: 'deliveryDate',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -165,6 +165,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     console.log("type:",type)
     console.log("formField:",formField)
     console.log(formField, searchField, val, formRef, type, row)
+    
     if (type == 'tableForm') {
       // 明细查询页赋值
       // row[formField] = val[0][searchField]
@@ -185,18 +186,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow['poLine'] = item['poLine']
         newRow['orderQty'] = item['orderQty']
         newRow['uom'] = item['uom']
+        if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
+
         itemCodes.push(item['itemCode'])
         tableData.value.push(newRow)
       })
-      //有效期
+      if(itemCodes.length>0){
-      ItembasicApi.getItembasicPage({
+        //有效期
-        code:itemCodes.join(',')
+        ItembasicApi.getItembasicPage({
-      }).then((res)=>{
+          code:itemCodes.join(',')
-        res.list.forEach((item,index)=>{
+        }).then((res)=>{
-          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+          res.list.forEach((item,index)=>{
-          findItem['expireTime'] = item['expireTime']
+            const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+            findItem['expireTime'] = item['expireTime']
+          })
         })
-      })
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/reportList/index.vue

@@ -9,7 +9,7 @@
 import { getAccessToken } from '@/utils/auth'
 // const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
 const route = useRoute() // 路由对象
-debugger
+
 const str = route.path.split('/')[3]
 const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str+ '?token='+ getAccessToken())
 console.log(url);

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -15,15 +15,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isSearch: true
-  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,6 +22,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -40,8 +32,38 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    sortTableDefault:2,
     isForm: false
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:10,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isSearch: true
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -541,6 +563,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '订单行',
@@ -550,6 +573,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '物流收货单号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单据号',
     field: 'number',
@@ -566,6 +605,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    sortTableDefault:8,
   },
   {
     label: '供应商代码',
@@ -579,10 +619,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    sortTableDefault:3,
     table: {
       width: 150
     },
   },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料名称',
     field: 'itemName',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -409,6 +409,11 @@ const handleImport = () => {
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
+    if(type=='update'){
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
+    }else{
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
+    }
     if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
     SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -765,6 +765,9 @@ export const SupplierinvoiceRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
+  invoiceTime:[
+    { required: false, message: '请选择发票日期', trigger: 'blur' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],