diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 9c34304e4..f97f153b2 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -7,6 +7,7 @@
     :vLoading="formLoading"
     @updateFullscreen="updateFullscreen"
   >
+    <div style="overflow-y: auto" :style="formHeight">
     <div style="overflow-y: auto" :style="formHeight">
       <Form
         ref="formRef"
@@ -78,7 +79,14 @@
           <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
         </template>
       </Form>
-      <div class="table" v-if="(isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
+      <Tabs ref="tabRef" v-if="formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" :tabsList="[{
+        label: '明细',
+        prop: 'TableForm'
+      },{
+        label: '汇总',
+        prop: 'CollectionTable'
+      }]" v-model="tabSheet" @change="tabChange"/>
+      <div class="table" v-if="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
@@ -116,7 +124,7 @@
           </template>
         </TableForm>
       </div>
-      <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <div v-if="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
         <TableFormCountPlan
           :tableFields="tableAllSchemas.tableFormColumns"
           :tableData="tableData"
@@ -128,6 +136,12 @@
           @handleDeleteTable="handleDeleteTable"
         />
       </div>
+      <div v-if="formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" v-show="tabSheet=='CollectionTable'">
+        <CollectionTable
+        :tableFields="tableAllSchemas?tableAllSchemas.tableFormColumns:[]"
+        :tableData="tableData"
+        ></CollectionTable>
+      </div>
     </div>
     <template #footer>
       <slot name="foorter"></slot>
@@ -153,6 +167,7 @@ import TableForm from '@/components/TableForm/src/TableForm.vue'
 import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
+import CollectionTable from '@/components/CollectionTable/src/CollectionTable.vue'
 import { isString } from 'min-dash'
 const count = ref(0)
 
@@ -366,14 +381,16 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
-const formHeight = ref({
-  height:'60vh'
-})
+
+const collectionRef = ref()
 const updateFullscreen = (isFullscreen) => {
   formHeight.value.height = isFullscreen ? 'auto' : '60vh'
   nextTick(()=>{
-    tableFormRef.value.reloadFullscreen(isFullscreen)
+    tableFormRef.value?.reloadFullscreen(isFullscreen)
+    collectionRef.value?.reloadFullscreen(isFullscreen)
+    
   })
+
 }
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -388,8 +405,25 @@ const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
 const sureDisabled = ref(false)
+const tabSheet = ref('TableForm')
 routeName.value = route.name
+const formHeight = ref({
+  'max-height': '60vh' 
+})
 
+const tabChange = (item) => {
+  tabSheet.value = item.prop
+}
+
+// if(!props.tableAllSchemas||formType.value!='create'){
+//   formHeight.value = {
+//     height:'auto'
+//   }
+// }else{
+//   formHeight.value = {
+//     height:'60vh'
+//   }
+// }
 // 列表-按钮
 // const buttondata = [
 //   defaultButtons.mainListEditBtn(null), // 编辑
@@ -626,6 +660,7 @@ const open = async (
   titleName?: any,
   alltitleName?: any
 ) => {
+  tabSheet.value = "TableForm"
   dialogVisible.value = true
   if (alltitleName) {
     dialogTitle.value = alltitleName
@@ -635,6 +670,15 @@ const open = async (
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
+  // if(!props.tableAllSchemas||formType.value!='create'){
+  //   formHeight.value = {
+  //     height:'auto'
+  //   }
+  // }else{
+  //   formHeight.value = {
+  //     height:'60vh'
+  //   }
+  // }
   resetForm()
   count.value = 0
   // 修改时，设置数据
@@ -1063,26 +1107,26 @@ defineExpose({
   padding: 10px;
   width: calc(100% - 32px);
   display: flex;
-}
-::v-deep(.el-table__body) {
-  padding: 10px 0px;
-}
-::v-deep(.el-table--default .el-table__cell) {
-  padding: 2px 0px;
-  border: none;
-}
+  ::v-deep(.el-table__body) {
+    padding: 10px 0px;
+  }
+  ::v-deep(.el-table--default .el-table__cell) {
+    padding: 2px 0px;
+    border: none;
+  }
 
-::v-deep(.el-table td.el-table__cell .el-form-item__content) {
-  display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-}
-::v-deep(.el-table td.el-table__cell div) {
-  overflow: visible;
-}
+  ::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+  }
+  ::v-deep(.el-table td.el-table__cell div) {
+    overflow: visible;
+  }
 
-::v-deep(.el-icon) {
-  display: block;
+  ::v-deep(.el-icon) {
+    display: block;
+  }
 }
 button .button {
   > div {
diff --git a/src/components/CollectionTable/index.ts b/src/components/CollectionTable/index.ts
new file mode 100644
index 000000000..6f760ab29
--- /dev/null
+++ b/src/components/CollectionTable/index.ts
@@ -0,0 +1,3 @@
+import CollectionTable from './src/CollectionTable.vue'
+
+export { CollectionTable }
diff --git a/src/components/CollectionTable/src/CollectionTable.vue b/src/components/CollectionTable/src/CollectionTable.vue
new file mode 100644
index 000000000..cc5a849fb
--- /dev/null
+++ b/src/components/CollectionTable/src/CollectionTable.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-checkbox-group v-model="checkList" @change="checkChange">
+    <el-checkbox v-for="item in fields.filter(item=>item.checkBoxOption)" :label="item.label" :value="item.label" :disabled="item.checkedDisabled"/>
+  </el-checkbox-group>
+  <!-- v-clientTableForm="{
+    isShowPagination:false,
+    isShowButton: false,
+    isFullscreen:isFullscreen
+  }"  -->
+  <el-table class="collection" :data="showList"  border :style="{width:tableWidth+'px'}">
+    <el-table-column type="index" width="60" label="序号" align="center"/>
+    <el-table-column  border row-key="id"
+        v-for="headerItem in fields.filter((item) => !!item.checked)"
+        :label="headerItem.label"
+        :prop="headerItem.field"
+        align="center"
+        :width="headerItem.width"
+    >
+    <template v-if="headerItem.label=='状态'" #default="scope">
+      <span>{{ getStatus(scope.row,headerItem.field) }}</span>
+
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+const { t } = useI18n() // 国际化
+
+const props = defineProps({
+  // 列表数据
+  tableData: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  // 列表头定义
+  tableFields: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  }
+})
+
+const fields = ref([{
+    field: 'itemCode',
+    label:'物料',
+    checkBoxOption:true, // 显示在checkbox中作为选项
+    checked:true, //checkbox 是否勾选
+    checkedDisabled:true, // checkbox 是否禁用
+    width:200
+},{
+    field: 'batch',
+    label:'批次',
+    checkBoxOption:true, // 显示在checkbox中作为选项
+    checked:false, //checkbox 是否勾选
+    checkedDisabled:false, // checkbox 是否禁用
+    width:100
+},{
+    field: 'locationCode',
+    label:'库位',
+    checkBoxOption:true, // 显示在checkbox中作为选项
+    checked:false, //checkbox 是否勾选
+    checkedDisabled:false, // checkbox 是否禁用
+    width:150
+},{
+    field: 'inventoryStatus',
+    label:'状态',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    checkBoxOption:true, // 显示在checkbox中作为选项
+    checked:false, //checkbox 是否勾选
+    checkedDisabled:false, // checkbox 是否禁用
+    width:100,
+},{
+    field: 'totalCount',
+    label:'数量',
+    checkBoxOption:false, // 显示在checkbox中作为选项
+    checked:true,
+    width:100
+}])
+
+const inventoryStatusList = getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)
+const getStatus = (row,field)=>{
+  let findStatus = inventoryStatusList.find(item=>item.value == row[field])
+  if(findStatus){
+    return findStatus.label
+  }else{
+    return row[field]
+  }
+}
+
+// 批次
+let batchField = props.tableFields.find(item=>item.field=='fromBatch'||item.field=='batch')
+if(batchField){//更新使用字段
+  fields.value[1].field = batchField.field
+  fields.value[1].checkBoxOption = true
+  
+}else{//子表没有的字段隐藏
+  fields.value[1].checkBoxOption = false
+}
+
+
+// 库位
+let locationField = props.tableFields.find(item=>item.field=='fromLocationCode'||item.field=='locationCode')
+if(locationField){//更新使用字段
+  fields.value[2].field = locationField.field
+  fields.value[2].checkBoxOption = true
+}else{//子表没有的字段隐藏
+  fields.value[2].checkBoxOption = false
+}
+
+// 状态
+let inventoryStatusField = props.tableFields.find(item=>item.field=='fromInventoryStatus'||item.field=='inventoryStatus')
+if(inventoryStatusField){//更新使用字段
+  fields.value[3].field = inventoryStatusField.field
+  fields.value[3].checkBoxOption = true
+}else{//子表没有的字段隐藏
+  fields.value[3].checkBoxOption = false
+}
+
+
+console.log('fields',fields.value)
+const tableWidth = ref(360)
+const checkList = ref(['物料'])
+const checkChange = (value)=>{
+  console.log('checkChange',value)
+  let width = 0
+  fields.value.forEach(item=>{
+    if(value.includes(item.label) || item.field=='totalCount'){
+      item.checked = true
+      width += item.width
+    }else{
+      item.checked = false
+    }
+  })
+  tableWidth.value = width + 60
+  nextTick(()=>{
+    updateShowList()
+  })
+}
+
+const showList = ref([])
+const updateShowList = ()=>{
+    showList.value = []
+    //数量的field 对象
+    const qtyField = props.tableFields.find(item=>item['field']=='qty')
+    //子表所有数据
+    let tableData = JSON.parse(JSON.stringify(props.tableData))
+    //用于存入重复数据index
+    let removeIndexs = [] 
+    for(let i=0;i<tableData.length;i++){
+      //重复数据进行过滤
+      if(removeIndexs.indexOf(i)>-1){
+        continue
+      }
+      let tableItem = tableData[i]
+      //不存在的数量，根据ts配置进行默认赋值
+      if(!tableItem['qty']){
+        tableItem['totalCount'] =Number(qtyField.min)
+      }else{
+        tableItem['totalCount'] = Number(tableItem['qty'])
+      }
+
+      //查找是否有相同数据
+      for(let j=i+1;j<tableData.length;j++){
+        let tempItem = tableData[j]
+        if(!tempItem['qty']){
+          //不存在 赋默认值
+          tempItem['qty'] = Number( qtyField.min) || 0
+        }
+        
+        //默认相等
+        let equal = true;
+        for (let k = 0; k < fields.value.length; k++) {
+          const fieldItem = fields.value[k];
+          // checkBoxOption：在checkbox的列表中
+          // checked：被勾选
+          if(fieldItem.checkBoxOption&&fieldItem.checked){
+            if(tableItem[fieldItem['field']]+''!==tempItem[fieldItem['field']]+''){
+              equal = false
+              break
+            }
+          }
+        }
+        //匹配到的相同数据存入removeIndexs中不进行下次计算，并且数量进行累计
+        if(equal){
+          removeIndexs.push(j) 
+          tableItem['totalCount'] = Number(tableItem['totalCount'])+Number(tempItem['qty'])
+        }
+      }
+      showList.value.push(tableItem)
+    }
+    console.log('汇总showList',showList.value)
+}
+updateShowList()
+watch(
+  () => props.tableData,
+  () => {
+    console.log('汇总props.tableData',props.tableData)
+    updateShowList()
+  },
+  {
+    deep: true
+  }
+)
+
+const isFullscreen = ref(false)
+const reloadFullscreen = (fullscreen)=>{
+  isFullscreen.value = fullscreen
+}
+defineExpose({
+  reloadFullscreen
+})
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index d8421d87c..1a9076d65 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -400,6 +400,12 @@ export default defineComponent({
                       onBlur={(e) => { onBlur(item.field, e) }}
                       onFocus={(e) => { onFocus(item.field) }}
                       onInput={(value)=>{onInput(item.field,value)}}
+                      onKeyup={(event)=>{
+                          if(event.keyCode === 13){
+                            //回车
+                            emit('onEnter',item.field,formModel.value[item.field],event)
+                          }
+                      }} 
                       {...(notRenderOptions.includes(item?.component as string) &&
                       item?.componentProps?.options
                         ? { options: item?.componentProps?.options || [] }
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index c233dd92c..f75d6fa2f 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -63,9 +63,15 @@ const props = defineProps({
     required: false,
     default: []
   },
+  //回车触发搜索。默认true
+  enterSearch:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
 })
 
-const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess'])
+const emit = defineEmits(['search', 'reset','onInput','onChange','onEnter','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -116,6 +122,13 @@ const onInput = (field,value) => {
 const onChange = (field, value)=>{
   emit('onChange', field,value)
 }
+const onEnter = async (field, value, e) => {
+  if(props.enterSearch){
+    search()
+  }else{
+    emit('onEnter', field, value, e)
+  }
+}
 const searchTableRef = ref()
 const opensearchTable = (
   formField,
@@ -291,6 +304,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
       @onInput="onInput"
       @opensearchTable="opensearchTable"
       @onChange="onChange"
+      @onEnter="onEnter"
     >
       <template #action>
         <div v-if="layout === 'inline'">
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 02dc5690c..728fbd500 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -150,10 +150,10 @@ const moreListOptions = ref({
 
  // 判断输入框类型
  const getInputType = (val) => {
-  
+
   const type = searchOption_high.value.find(item => (item.field == val))
   let data = 'input'
-  if (type?.dictType || type?.field == 'creator') {
+  if (type?.dictType || type?.field == 'creator'||type?.field == 'updater' ||type?.field == 'worker') {
     data = 'select'
   } else if (type?.form?.component == 'InputNumber') {
     data = 'inputNumber'
@@ -170,7 +170,7 @@ const moreListOptions = ref({
 const getFilterable = (val) => {
   const type = searchOption_high.value.find(item => (item.field == val))
   // 下拉列表过长，去掉筛选功能
-  if (type?.field == 'creator') {
+  if (type?.field == 'creator' || type?.field == 'updater' || type?.field == 'worker') {
     return false
   }else{
     return true
@@ -182,7 +182,7 @@ const getFilterable = (val) => {
   let precision = 6
   if (type?.form?.component == 'InputNumber') {
     precision = type?.form?.componentProps?.precision || type?.form?.componentProps?.precision == 0  ? type.form.componentProps.precision : 6
-  } 
+  }
   return precision
 }
 // 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull
@@ -204,7 +204,7 @@ const moreListDelete = (val,item,$event) => {
   } else {
     message.confirm(t('ts.您确定删除吗, 是否继续?')).then(() => {
       moreListData.value.filters.splice(val, 1)
-    })    
+    })
   }
 }
 
@@ -243,7 +243,7 @@ const actionSelect = (val)=>{
     val.value1 =[]
     val.value = ''
   })
-  
+
 }
 
 // 查询 重置按钮事件
@@ -265,11 +265,11 @@ const buttonBaseClick = (val) => {
           value:item.value,
         }
       }
-      
+
       data.push(obj)
     })
     if (props.masterId){
-      data.push({ 
+      data.push({
         column: 'masterId',
         action: "==",
         value: props.masterId,
@@ -298,7 +298,7 @@ const getDictOptions = ()=>{
     // allDictOptions.value[item.field] = getStrDictOptions(item.dictType)
       if (item.dictType) {
         allDictOptions.value[item.field] = getStrDictOptions(item.dictType)
-      } else if(item.field == 'creator'){
+      } else if(item.field == 'creator'||item.field == 'updater' ||item.field == 'worker'){
         allDictOptions.value[item.field] = userListAll.value
       }
   })
@@ -387,4 +387,4 @@ defineExpose({
      }
    }
 //  }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 1da966ea4..57dd2ceae 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,11 +1,13 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table v-clientTableForm="{
+    <!-- v-clientTableForm="{
+      showTab:showTab,
       isShowPagination:tableData.length > 10,
       isShowButton: isShowButton || isShowReduceButtonSelection,
       isFullscreen:isFullscreen
-    }"
+    }" -->
+    <el-table 
       class="multipleTableComponents"
       ref="TableBaseComponents_Ref"
       v-loading="tableLoading"
diff --git a/src/directives/permission/clientTable.ts b/src/directives/permission/clientTable.ts
index bf41a8f2c..a8672fe63 100644
--- a/src/directives/permission/clientTable.ts
+++ b/src/directives/permission/clientTable.ts
@@ -44,10 +44,9 @@ export function clientTable(app: App<Element>) {
   app.directive('clientTableForm', (el, binding) => {
     nextTick(() => {
       let {isShowPagination,isShowButton,isFullscreen} = binding.value
-      console.log('clientTableForm')
       let footerHeight = 0
       let headerHeight = 0
-      el.offsetParent.children.forEach(element => {
+      el.offsetParent?.children?.forEach(element => {
         if(element.className=='el-dialog__footer'){
           footerHeight = element.clientHeight
         }
@@ -55,20 +54,16 @@ export function clientTable(app: App<Element>) {
           headerHeight = element.clientHeight
         }
       });
-      console.dir(el)
       let top = el.getBoundingClientRect().top
-      let tableFormTop = top - el.offsetParent.offsetTop
-      console.log(top)
-      console.log(el.offsetParent.offsetTop)
-      console.log(el.offsetParent.clientHeight)
-      let height = el.offsetParent.clientHeight - tableFormTop - footerHeight - 30
+      let tableFormTop = top - (el.offsetParent?.offsetTop||0)
+      
+      let height = el.offsetParent?.clientHeight - tableFormTop - footerHeight - 30
       if(isShowPagination){
         height = height- 34
       }
       if(isShowButton){
         height = height- 50
       }
-      console.log(height)
       el.style.height = height + 'px'
     })
   })
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index f63c249cd..fa87e3649 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -359,7 +359,7 @@ const updateFormFields = (sampleType, formRef) => {
   SamplingProcessRules.sampleQty[0].required = sampleQtyRequired
   SamplingProcessRules.sampleProgCode[0].required = sampleProgCodeRequired
 
-  formRef.value.setValues({
+  formRef?.value?.setValues({
     sampleQty: '',
     sampleProgCode: ''
   })
@@ -367,7 +367,7 @@ const updateFormFields = (sampleType, formRef) => {
 
 const openForm = async (type, row) => {
   basicFormRef.value.open(type, row)
-  updateFormFields(row.sampleType, basicFormRef)
+  updateFormFields(row?.sampleType, basicFormRef)
 }
 
 const onChange = async (field, value, formRef) => {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index 8e18c295d..22878a2e9 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -65,6 +65,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Shift' })
 
@@ -239,8 +240,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ShiftApi.exportShift(tableObject.params)
-    download.excel(data, '班次.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -255,7 +257,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '班次导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index 31e8df4fe..8e295897d 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -446,7 +446,7 @@ export const Balance = useCrudSchemas(
         }
       },
       isForm: false,
-      isTable: false
+      isTable: true
     },
     {
       label: '最后更新者',
@@ -456,7 +456,7 @@ export const Balance = useCrudSchemas(
         width: 150
       },
       isForm: false,
-      isTable: false
+      isTable: true
     },
     // TODO: 临时添加 方便操作
     {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 12f41d622..49c7d0fdb 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -397,6 +397,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 1e99700f7..56d170f54 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -177,6 +177,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             newRow['itemCode'] = item['itemCode']
             newRow['uom'] = item['uom']
             newRow['singlePrice'] = itemCode ? itemCode['price'] : ''
+            newRow['amount'] = newRow['qty'] * newRow['singlePrice']
             tableData.value.push(newRow)
           })
           // row['singlePrice'] = res.price
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 8611480fe..1d8e63db0 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -252,7 +252,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入
+  //defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 00bfdf790..761dbda4f 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -65,7 +65,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isForm: false,
     isTable: true,
     sort: 'custom',
@@ -397,7 +397,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -412,7 +412,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     isForm: false,
   },
   {
@@ -714,12 +714,67 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         isSearch: true,
         isMainValue: false
       },{
-        key: 'businessTypeCode',
-        value: 'UnplannedReceipt',
-        action: '==',
+        key: 'type',
+        value: 'ZZBZ',
+        action: '!=',
         isSearch: true,
         isMainValue: false
-        }],
+      },{
+        key: 'type',
+        value: 'WGJ',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'Q&J',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'PRHC',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'ONBZ',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'DZYH',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'CCP',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'BCP',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'QJ',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'type',
+        value: 'YCL',
+        action: '!=',
+        isSearch: true,
+        isMainValue: false
+      }
+        ],
       verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
       isShowTableFormSearch: true, //tableForm下方是否出现输入框
       verificationParams: [{
@@ -751,7 +806,8 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           action: '==',
           isSearch: true,
           isMainValue: false
-          }],
+          }
+          ],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -926,6 +982,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
+    isSearch:false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 225dec49e..e58b25bb5 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -496,7 +496,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '备注',
+    label: '订单号',
     field: 'remarkMain',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index c86f9d785..14dd3b34a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -505,6 +505,11 @@ const openForm =async (type: string, row?: number) => {
   if (type == 'update') {
     // 修改 tableform 属性
     ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      //生产线代码
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
       if(itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
@@ -513,6 +518,11 @@ const openForm =async (type: string, row?: number) => {
   } else {
     // 修改 tableform 属性
     ProductionreturnRequestMain.allSchemas.formSchema.map(itemColumns => {
+      //生产线代码
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
       if(itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
index fced86acb..b10e3b131 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
@@ -82,6 +82,7 @@ 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 { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ProcessproductionRequestMain' })
 
@@ -236,8 +237,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProcessproductionRecordMainApi.exportProcessproductionRecordMain(tableObject.params)
-    download.excel(data, route.meta.title+'.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -252,7 +254,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工序报产申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 35d0113d7..feb84a75c 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -44,6 +44,15 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+  },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index d0518f979..cf13590fe 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -55,6 +55,15 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+  },
   // {
   //   label: '生产计划单号',
   //   field: 'productionPlanNumber',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 200e490ac..02030f9a1 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -105,7 +105,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true,
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index ab11f0b25..44b1f1c94 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -696,8 +696,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, 'M类型采购收货.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -777,7 +778,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index cfe08ae92..514d82d2f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -527,6 +527,26 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
   {
     label: '采购订单号',
     field: 'poNumber',