diff --git a/.env.test b/.env.test
index 2c1e25575..314cbd94e 100644
--- a/.env.test
+++ b/.env.test
@@ -4,10 +4,10 @@ NODE_ENV=test
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:29000/api'
 
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:29000/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
@@ -31,13 +31,13 @@ VITE_BASE_PATH=/
 VITE_OUT_DIR=sfms3.0-ui
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:29000/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
+VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:29000'
 
 # 租户配置
-VITE_TENANT='["长春1379","成都1397","长春2379"]'
+VITE_TENANT='["长春","成都"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index 9b3f59c7e..b8ff3f9fa 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -4,7 +4,7 @@ import request from '@/config/axios'
 // 查询检验任务列表
 export const getInspectionJobMainPage = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
+    // delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/qms/inspection-job-main/senior', data })
   } else {
diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
index 81ffa403e..f5ec5d94b 100644
--- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
+++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts
@@ -26,8 +26,8 @@ export interface InspectionRecordMainVO {
 // 查询检验申请列表
 export const getInspectionRecordMainPage = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
+    // delete params.isSearch
+    const data = { ...params }
     return await request.post({ url: '/qms/inspection-record-main/senior', data })
   } else {
     return await request.get({ url: `/qms/inspection-record-main/page`, params })
@@ -62,16 +62,23 @@ export const deleteInspectionRecordMain = async (id: number) => {
 export const exportInspectionRecordMain = async (params) => {
   if (params.isSearch) {
     const data = { ...params }
-    return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-senior`, data })
+    return await request.downloadPost({
+      url: `/qms/inspection-record-main/export-excel-senior`,
+      data
+    })
   } else {
     return await request.download({ url: `/qms/inspection-record-main/export-excel`, params })
   }
 }
 
+// 导出首件检验记录 Excel
 export const exportFirstInspectionRecordMain = async (params) => {
   if (params.isSearch) {
     const data = { ...params }
-    return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-first-senior`, data })
+    return await request.downloadPost({
+      url: `/qms/inspection-record-main/export-excel-first-senior`,
+      data
+    })
   } else {
     return await request.download({ url: `/qms/inspection-record-main/export-excel-first`, params })
   }
diff --git a/src/api/qms/inspectionRequest/index.ts b/src/api/qms/inspectionRequest/index.ts
index b3033bc32..68dc89e56 100644
--- a/src/api/qms/inspectionRequest/index.ts
+++ b/src/api/qms/inspectionRequest/index.ts
@@ -20,7 +20,7 @@ export interface InspectionMainVO {
 // 查询检验申请列表
 export const getInspectionMainPage = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
+    // delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/qms/inspection-request-main/senior', data })
   } else {
diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index e3303bbd1..309422d37 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -72,6 +72,9 @@ const getPageParams = (params)=>{
 export const getDemandforecastingDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
+    if(params.flag){
+      delete params.flag
+    }
     const data = {...params}
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 7d5596a8f..0433af12c 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { isString } from '@/utils/is'
 
 export interface DemandforecastingMainVO {
   supplierCode: string
@@ -66,6 +67,56 @@ export const witPurchaseMain = async (id: number) => {
   return await request.post({ url: `/wms/demandforecasting-main/wit?id=` + id })
 }
 
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+  // 到货日期
+  if(params.dueDate&&params.dueDate.length>0){
+    if(isString(params.dueDate[0])){
+      params.startDate = params.dueDate[0]
+    }else{
+      params.startDate = params.dueDate[0].format('YYYY-MM-DD')
+    }
+
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    if(isString(params.dueDate[1])){
+      params.endDate = params.dueDate[1]
+    }else{
+      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+    }
+  }
+  params.dueDate = ''
+
+  //计划员
+  if(params.planerId&&params.planerId.length>0){
+    params.planers = params.planerId.join(',')
+  }
+  params.planerId = ''
+  // 供应商代码
+  if(params.supplierCode&&params.supplierCode.length>0){
+    let keyValue = params.supplierCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.supplierCodes = keyValue.join(',')
+  }
+  params.supplierCode = ''
+
+  // 物料代码
+  if(params.itemCode&&params.itemCode.length>0){
+    let keyValue = params.itemCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.itemCodes = keyValue.join(',')
+  }
+  params.itemCode = ''
+
+  // 版本号
+  if(params.version&&params.version.length>0){
+    let keyValue = params.version.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.versions = keyValue.join(',')
+  }
+  params.version = ''
+  return params
+}
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
   if (params.isSearch) {
@@ -73,6 +124,7 @@ export const exportDemandforecastingMain = async (params) => {
     const data = {...params}
     return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
   } else {
+    params = getPageParams(params)
     return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
   }
 }
diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts
index 9d9c4f083..03e2f36a3 100644
--- a/src/api/wms/inventorymoveRecordMain/index.ts
+++ b/src/api/wms/inventorymoveRecordMain/index.ts
@@ -45,7 +45,7 @@ export const getInventorymoveRecordMain = async (id: number) => {
 
 // 新增库存转移记录主
 export const createInventorymoveRecordMain = async (data: InventorymoveRecordMainVO) => {
-  return await request.post({ url: `/wms/inventorymove-record-main/create`, data })
+  return await request.post({ url: `/wms/inventorymove-record-main/createMove`, data })
 }
 
 // 修改库存转移记录主
diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index 36cf3f575..bce556d5c 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -34,6 +34,17 @@ export const getLocationPage = async (params) => {
     return await request.get({ url: `/wms/location/page`, params })
   }
 }
+
+export const getLocationMPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/Msenior', data })
+  } else {
+    return await request.get({ url: `/wms/location/Mpage`, params })
+  }
+}
+
 export const getLocationPageRepleinsh = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -139,4 +150,4 @@ export const selectConfigToLocation = async (params) => {
 // 根据code获取数据列表
 export const getLocationByCodes = async (params) => {
   return await request.get({ url: `/wms/location/listByCodes`, params })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/productionreturnRecordDetail/index.ts b/src/api/wms/productionreturnRecordDetail/index.ts
index f9ffcd4a4..910cb941e 100644
--- a/src/api/wms/productionreturnRecordDetail/index.ts
+++ b/src/api/wms/productionreturnRecordDetail/index.ts
@@ -44,6 +44,26 @@ export const getProductionreturnRecordDetailPage = async (params) => {
     return await request.get({ url: `/wms/productionreturn-record-detail/page`, params })
   }
 }
+// 查询生产退料记录子列表
+export const getProductionreturnRecordDetailPageStore = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-detail-store/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-detail-store/page`, params })
+  }
+}
+// 查询隔离退料记录子列表
+export const getProductionreturnRecordDetailPageHold = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-record-detail-hold/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-record-detail-hold/page`, params })
+  }
+}
 
 // 查询生产退料记录子详情
 export const getProductionreturnRecordDetail = async (id: number) => {
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index 074f47423..e3dd420d9 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -95,7 +95,7 @@ export const exportProductreceiptRecordMain = async (params) => {
     params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
   }
diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts
index a436ab74a..d09baf96a 100644
--- a/src/api/wms/purchasePlanDetail/index.ts
+++ b/src/api/wms/purchasePlanDetail/index.ts
@@ -20,10 +20,12 @@ const getPageParams = (params)=>{
 
   console.log('params.status',params.status)
   // 状态
-  if(params.status&&params.status.length>0){
-    params.statuss = params.status.join(',')
+  if(Array.isArray(params.status)){
+    if(params.status&&params.status.length>0){
+      params.statuss = params.status.join(',')
+    }
+    params.status = ''
   }
-  params.status = ''
   return params
 }
 // 查询要货计划子列表
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 57b8ee523..f30f0f829 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -106,6 +106,7 @@
           :routeName="routeName"
           @visibleChange="visibleChange"
           @inputStringFcous='inputStringFcous'
+          :sureDisabled="sureDisabled"
         >
           <template v-slot="{ row }">
             <slot :row="row"></slot>
@@ -133,6 +134,7 @@
   <SearchTable
     ref="searchTableRef"
     :showSearchTableQueryFields="showSearchTableQueryFields"
+    :isCheckStrictly="isCheckStrictly"
     @searchTableSuccess="searchTableSuccess"
   >
     <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
@@ -339,6 +341,11 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: false
+  },
+  // true 取消父子关联; false 关联
+  isCheckStrictly:{
+    type:Boolean,
+    default:false
   }
 })
 
@@ -371,6 +378,7 @@ const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
+const sureDisabled = ref(false)
 routeName.value = route.name
 
 // 列表-按钮
@@ -886,6 +894,7 @@ const onBlur = async (field, e) => {
       ]
       count.value++
     }
+      sureDisabled.value= false
   } else {
     emit('onBlur', field, e)
   }
@@ -954,7 +963,9 @@ const inputStringBlur = async (headerItem, val, row, index) => {
         defaultButtons.formCloseBtn(null) // 关闭
       ]
       count.value++
-    }
+  }
+    
+      sureDisabled.value= false
 }
 // 聚焦
 const onFocus = (field) => {
@@ -967,6 +978,7 @@ const onFocus = (field) => {
       ]
     }
     count.value++
+    sureDisabled.value= true
   }
 }
 const inputStringFcous= (headerItem) => {
@@ -978,6 +990,7 @@ const inputStringFcous= (headerItem) => {
       ]
     }
     count.value++
+    sureDisabled.value= true
   }
 }
 /**
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index c9745202f..a95460d5f 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -271,7 +271,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 const Search = ref()
 onMounted(() => {})
-defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
+defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
 
 </script>
 
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 38336acc4..2dd84a162 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -18,6 +18,7 @@
       <Table
         v-clientSearchTable
         ref="searchTableRef"
+        :isCheckStrictly="isCheckStrictly"
         :columns="tableColumns"
         :data="tableObjectRef.tableList"
         :loading="tableObjectRef.loading"
@@ -59,6 +60,11 @@ const props = defineProps({
     required: false,
     default: []
   },
+  // true 取消父子关联; false 关联
+  isCheckStrictly:{
+    type:Boolean,
+    default:false
+  }
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -285,11 +291,17 @@ const submitForm = async () => {
   }
 }
 const rowClick = (row: any, column: any, event: Event) => {
+
   const selected = searchTableRef.value?.elTableRef
     ?.getSelectionRows()
     .some((item) => item.id === row.id)
   if (!selected) {
     searchTableRef.value?.elTableRef?.toggleRowSelection(row, true)
+    if(props.isCheckStrictly&&row.children){//取消关联
+      row.children.forEach(item => {
+        searchTableRef.value?.elTableRef?.toggleRowSelection(item, false)
+      });
+    }
   } else {
     // 取消
     searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 8b9701825..e3499a988 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -63,6 +63,8 @@ export default defineComponent({
     searchTableSelectionsList:[],//回显列表
     selectionColor: propTypes.bool.def(false),
     rowKey: propTypes.string.def(''),
+    // true 取消父子关联; false 关联
+    isCheckStrictly: propTypes.bool.def(false),
   },
   emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
@@ -120,8 +122,16 @@ export default defineComponent({
     const selections = ref<Recordable[]>([])
     const sortRef = ref()
     // 选中某行
-    const selectRow  = ()=>{
-      console.log(currentPageRef.value,elTableRef.value?.getSelectionRows())
+    const selectRow  = (selection,row)=>{
+      nextTick(()=>{
+        const selected = elTableRef.value?.getSelectionRows().some((item) => item.id === row.id)
+
+        if(props.isCheckStrictly&&selected&&row.children){//取消关联
+          row.children.forEach(item => {
+            elTableRef.value?.toggleRowSelection(item, false);
+          });
+        }
+      })
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
     //全选回调
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 57cabc4f5..1da966ea4 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -69,6 +69,7 @@
         :min-width="headerItem?.tableForm?.minWidth || '200px'"
       >
         <el-form
+          @submit.native.prevent
           ref="TableBaseForm_Ref"
           :model="row"
           style="width: 100%"
@@ -95,7 +96,7 @@
               :disabled="disabledInput(headerItem, row)"
               style="flex: 1"
               @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
-              @clear='clearInput(headerItem.field, row, index)'
+              @clear="clearInput(headerItem.field, row, index)"
               @focus="inputStringFcous(headerItem)"
             />
             <Icon
@@ -119,7 +120,7 @@
             <slot :row="row"></slot>
           </el-form-item>
           <!-- 金额输入框 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" >
+          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field">
             <el-input
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
@@ -172,10 +173,10 @@
               @visible-change="visibleChange(headerItem.field, $event, row, $index)"
             >
               <el-option
-                v-for="op in initSelectOptions(headerItem,row)"
-                :label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')"
-                :value="initValue(headerItem,op)"
-                :key="initValue(headerItem,op)"
+                v-for="op in initSelectOptions(headerItem, row)"
+                :label="t(`ts.${initLabel(headerItem, op)}`).replace('ts.', '')"
+                :value="initValue(headerItem, op)"
+                :key="initValue(headerItem, op)"
               />
             </el-select>
           </el-form-item>
@@ -202,7 +203,7 @@
               @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
             >
               <el-option-group
-                v-for="group in initSelectOptions(headerItem,row)"
+                v-for="group in initSelectOptions(headerItem, row)"
                 :key="group.type"
                 :label="t(`ts.${group.name}`).replace('ts.', '')"
               >
@@ -308,7 +309,7 @@
               :id="headerItem?.tableForm?.id"
             >
               <el-radio
-                v-for="(item, index) in initSelectOptions(headerItem,row)"
+                v-for="(item, index) in initSelectOptions(headerItem, row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :size="headerItem?.tableForm?.size"
@@ -332,7 +333,7 @@
               :fill="headerItem?.tableForm?.fill"
             >
               <el-checkbox
-                v-for="(item, index) in initSelectOptions(headerItem,row)"
+                v-for="(item, index) in initSelectOptions(headerItem, row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :disabled="itemIsDisabled(headerItem, row)"
@@ -394,32 +395,34 @@
       layout="total, prev, pager, next, jumper"
       :total="tableData.length"
     />
-    <div class="button flex" v-if="isShowButton || isShowReduceButtonSelection">
-      <div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable">
-        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
-        <div>{{ t('ts.添加明细') }}</div>
-      </div>
-      <div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete">
-        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" />
-        <div>{{ t('ts.批量删除') }}</div>
-      </div>
-      <div
-        class="p-12px"
-        v-if="
-          isShowTableFormSearch?.isShowTableFormSearch||
-          routeName == 'PurchaseMain' ||
-          routeName == 'PurchaseMain' ||
-          routeName == 'ProductionMain' ||
-          routeName == 'ZZBJDeliverPlanMain' ||
-          routeName == 'DeliverPlanMain' ||
-          routeName == 'DeliverRequestMain' ||
-          routeName == 'ZZBJDeliverRequestMain' ||
-          routeName == 'UnplannedreceiptRequestMain'||
-          routeName == 'RepleinshRequestMain'
-          
-        "
+    <div class="button flex" style="padding-top: 10px" v-if="isShowButton || isShowReduceButtonSelection">
+      <el-button
+        type="primary"
+        link
+        v-if="isShowButton"
+        @click.stop="handleAddTable"
+        :disabled="sureDisabled"
+        :icon="CirclePlus"
+        size="large"
+      >
+        <span>{{ t('ts.添加明细') }}</span>
+      </el-button>
+      <el-button
+        type="primary"
+        link
+        v-if="isShowReduceButtonSelection"
+        @click.stop="handleSelectionDelete"
+        :icon="Remove"
+        size="large"
       >
-        <el-input v-model="keyWord" style="width: 240px" :placeholder="`请输入${isShowTableFormSearch?.label}，多条数据逗号分隔`" />
+        <span>{{ t('ts.批量删除') }}</span>
+      </el-button>
+      <div class="p-12px" v-if="isShowTableFormSearch?.isShowTableFormSearch">
+        <el-input
+          v-model="keyWord"
+          style="width: 240px"
+          :placeholder="`请输入${isShowTableFormSearch?.label}，多条数据逗号分隔`"
+        />
         <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
           t('批量添加')
         }}</el-button>
@@ -432,6 +435,7 @@
 const { t } = useI18n() // 国际化
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { CirclePlus, Remove } from '@element-plus/icons-vue'
 const props = defineProps({
   // 是否显示添加按钮
   isShowButton: {
@@ -505,11 +509,16 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  // 添加明细是否可点击
+  sureDisabled: {
+    type: Boolean,
+    default: false
   }
 })
 let isShowTableFormSearch = ref({})
-console.log(33333,props.tableFields)
-isShowTableFormSearch.value =props.tableFields.find(item=>item.isShowTableFormSearch)
+console.log(33333, props.tableFields)
+isShowTableFormSearch.value = props.tableFields.find((item) => item.isShowTableFormSearch)
 
 // 传递给父类
 const emit = defineEmits([
@@ -534,11 +543,13 @@ const emit = defineEmits([
   'inputStringFcous'
 ])
 // 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (headerItem,row) => {
-  if(row[headerItem.field+'InitOptions']){
-    return row[headerItem.field+'InitOptions']
-  }else{
-    return headerItem.dictType ? getStrDictOptions(headerItem.dictType) : headerItem.tableForm.initOptions
+const initSelectOptions = (headerItem, row) => {
+  if (row[headerItem.field + 'InitOptions']) {
+    return row[headerItem.field + 'InitOptions']
+  } else {
+    return headerItem.dictType
+      ? getStrDictOptions(headerItem.dictType)
+      : headerItem.tableForm.initOptions
   }
 }
 //普通下拉改变事件
@@ -625,7 +636,7 @@ const TableBaseForm_Ref = ref()
 
 const validateForm = () => {
   let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
-  if(!_lists ||_lists.length == 0){
+  if (!_lists || _lists.length == 0) {
     return false
   }
   return Promise.all(_lists)
@@ -660,7 +671,7 @@ const inputStringBlur = (headerItem, val, row, index) => {
 }
 // 聚焦
 const inputStringFcous = (headerItem) => {
-   emit('inputStringFcous', headerItem)
+  emit('inputStringFcous', headerItem)
 }
 const clearInput = (field, row, index) => {
   emit('clearInput', field, row, index)
@@ -670,7 +681,7 @@ const buttonOperationClick = (row, label, index) => {
   emit('buttonOperationClick', row, label, index)
 }
 const visibleChange = (field, val, row, index) => {
-  emit('visibleChange',field, val, row, index)
+  emit('visibleChange', field, val, row, index)
 }
 const currentPage = ref(1)
 const pageSize = ref(10)
@@ -714,19 +725,19 @@ const disabledInput = (headerItem, row) => {
     )
   }
 }
-const  initLabel=(headerItem,op)=>{
-if(headerItem?.tableForm?.labelField){
-  return op[headerItem?.tableForm?.labelField]
-}else{
-  return op.label
-}
-}
-const  initValue=(headerItem,op)=>{
-if(headerItem?.tableForm?.valueField){
-  return op[headerItem?.tableForm?.valueField]
-}else{
-  return op.value
+const initLabel = (headerItem, op) => {
+  if (headerItem?.tableForm?.labelField) {
+    return op[headerItem?.tableForm?.labelField]
+  } else {
+    return op.label
+  }
 }
+const initValue = (headerItem, op) => {
+  if (headerItem?.tableForm?.valueField) {
+    return op[headerItem?.tableForm?.valueField]
+  } else {
+    return op.value
+  }
 }
 
 const isFullscreen = ref(false)
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 001e627c8..0da995066 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1041,6 +1041,7 @@ export default {
     采购收货记录主:'采购收货记录主',
     采购拒收记录主:'采购拒收记录主',
     采购退货记录主:'采购退货记录主',
+    采购拒收记录主:'采购拒收记录主',
     合同附件:'合同附件',
     发票附件:'发票附件',
     货运单附件:'货运单附件',
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 7da49b08b..53cdbd581 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -10,24 +10,32 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
   // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+  // return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+  return sessionStorage.getItem(AccessTokenKey) ? sessionStorage.getItem(AccessTokenKey) : sessionStorage.getItem('ACCESS_TOKEN')
+
 }
 
 // 刷新token
 export const getRefreshToken = () => {
-  return wsCache.get(RefreshTokenKey)
+  // return wsCache.get(RefreshTokenKey)
+  return sessionStorage.getItem(RefreshTokenKey)
+
 }
 
 // 设置token
 export const setToken = (token: TokenType) => {
-  wsCache.set(RefreshTokenKey, token.refreshToken)
-  wsCache.set(AccessTokenKey, token.accessToken)
+  // wsCache.set(RefreshTokenKey, token.refreshToken)
+  // wsCache.set(AccessTokenKey, token.accessToken)
+  sessionStorage.setItem(RefreshTokenKey,token.refreshToken)
+  sessionStorage.setItem(AccessTokenKey,token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
-  wsCache.delete(AccessTokenKey)
-  wsCache.delete(RefreshTokenKey)
+  // wsCache.delete(AccessTokenKey)
+  // wsCache.delete(RefreshTokenKey)
+  sessionStorage.removeItem(AccessTokenKey)
+  sessionStorage.removeItem(RefreshTokenKey)
 }
 
 /** 格式化token（jwt格式） */
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 79b9bfc0b..5c75f708f 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -203,6 +203,7 @@ export enum DICT_TYPE {
   CARRIER_TYPE = 'carrier_type', // 承运商类型
   INSPECT_TYPE = 'inspect_type', // 检验类型
   INSPECTION_TYPE = 'inspection_type', // 质量管理检验类型
+  INSPECTION_TYPE_NEW = 'inspection_type_new', // 质量管理检验类型
   NEXT_ACTION = 'next_action', // 下一步检验动作
   SAMPLE_METHOD = 'sample_method', // 抽检方式
   WAREHOUSE_TYPE = 'warehouse_type', // 仓库类型
@@ -322,6 +323,9 @@ export enum DICT_TYPE {
   QUALITY_NOTIFICATION_PRIORITY = 'quality_notification_priority', // 质量通知优先级
   CLAIM_REASON = 'claim_Reason', // 质量通知索赔原因
   QMS_CODE = 'qms_code', // 质量通知代码
+  QMS_Q1_CODE = 'qms_Q1_code',
+  QMS_Q2_CODE = 'qms_Q2_code',
+  QMS_Q3_CODE = 'qms_Q3_code',
   DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置
   DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型
   PROBLEM_REASON = 'problem_reason', // 质量通知问题原因
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index c13f2c718..6c85e902d 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -9,7 +9,7 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center ">
-          <img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
+          <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
           <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
@@ -33,7 +33,7 @@
           class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px w-36px h-36px" src="@/assets/imgs/logo_white.png" />
+            <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white_blue.png" />
             <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">
diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index 492a8747b..4e860979f 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -578,7 +578,16 @@ export const Aql = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
index 5e8459bd3..c68b864b3 100644
--- a/src/views/qms/counter/counter.data.ts
+++ b/src/views/qms/counter/counter.data.ts
@@ -208,7 +208,16 @@ export const Counter = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts
index 539a3dd5c..c502fe5c5 100644
--- a/src/views/qms/dynamicRule/dynamicRule.data.ts
+++ b/src/views/qms/dynamicRule/dynamicRule.data.ts
@@ -76,7 +76,16 @@ export const DynamicRule = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 1e9fa395f..7fcdee9ed 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -6,6 +6,7 @@
       :width="dialogWidth"
       :close-on-click-modal="false"
       :vLoading="formLoading"
+      :before-close="handleClose"
     >
       <div
         class="box"
@@ -414,7 +415,7 @@
                             </el-select>
                           </el-form-item>
                         </el-col>
-                           <el-col :span="24">
+                                <el-col :span="24">
                                 <el-form-item label="备注">
                                   <el-input
                                     v-model="item.inspectionJobCharacteristicsUpdateReqVO.remark"
@@ -512,7 +513,6 @@
                                   </el-select>
                                 </el-form-item>
                               </el-col>
-                           
                               <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
@@ -926,8 +926,9 @@ const buttonBaseClick = async (val) => {
   }
   // 关闭
   else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+     await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
     dialogVisible.value = false
+    emit('close')
   }
   // 暂存
   else if (val == 'staging') {
@@ -935,7 +936,7 @@ const buttonBaseClick = async (val) => {
   }
 }
 // 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const emit = defineEmits(['submitForm', 'searchTableSuccess','close'])
 const validateForm = (formRef) => {
   let _lists = formRef?.map((v) => v.validate())
   return Promise.all(_lists)
@@ -1519,6 +1520,11 @@ const inspectionValueInput = (item, cur) => {
     }
   }
 }
+const handleClose =async (done: () => void) => {
+    await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+    emit('close')
+    done()
+}
 </script>
 <style scoped>
 .small-title {
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index aa6cdd7f5..47f35526a 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -20,7 +20,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -57,6 +58,7 @@
     :rules="InspectionJobMainRules"
     :formAllSchemas="InspectionJobMain.allSchemas"
     @submitForm="submitForm"
+    @close="getList"
   />
   <!-- 详情 -->
   <Detail
@@ -83,13 +85,13 @@
     :list="list"
   />
   <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
   </el-dialog>
 </template>
 
@@ -119,6 +121,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import AddForm from './addForm.vue'
 import Detail from './detail.vue'
 import { getReportUrl } from '@/utils/systemParam'
+import { useUserStore } from '@/store/modules/user'
 
 // 采购订单
 defineOptions({ name: 'inspectionJobMain' })
@@ -129,7 +132,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
-
+const userStore = useUserStore()
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -180,7 +183,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn(null),
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-job-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -199,7 +202,13 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') {
     // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') {
     // 筛选
   } else {
@@ -226,23 +235,35 @@ const isShowMainButton2 = (row, val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton1 = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (userStore.getUser.id == row.acceptUserId) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:accept'
-    }), // 承接
+    // defaultButtons.mainListJobAccBtn({
+    //   hide: isShowMainButton(row, ['1']),
+    //   hasPermi: 'qms:inspection-job-main:accept'
+    // }), // 承接
     defaultButtons.mainListJobCloBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-job-main:close'
     }), // 关闭
     defaultButtons.mainListJobAbaBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton1(row, ['2']),
       hasPermi: 'qms:inspection-job-main:abandon'
     }), // 放弃
     defaultButtons.mainListJobExeBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton(row, ['1', '2']),
       hasPermi: 'qms:inspection-job-main:execute'
     }), // 执行
     defaultButtons.mainListOrderPubBtn({
@@ -284,14 +305,13 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
-// 查看质检报告
 // 查看质检报告
 const reportHeight = ref(window.innerHeight - 120)
 const showQualityReport = ref(false)
 const qualityReport = ref('')
 const checkQualityReport = async (row) => {
   showQualityReport.value = true
-  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
 }
 
 /** 添加/修改操作 */
@@ -309,8 +329,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 //执行
 
 const formRef = ref()
-const execute = async (type: string, row?: number) => {
-  formRef.value.open(type, row)
+const execute = async (type: string, row?: any) => {
+  if (row.status == '2') {
+    if (userStore.getUser.id == row.acceptUserId) {
+      formRef.value.open(type, row)
+    } else {
+      message.error('承接人与当前登录人不一致')
+    }
+  } else if (row.status == '1') {
+    await handleAccept(row.id)
+    formRef.value.open(type, row)
+    await getList()
+  }
 }
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
@@ -321,7 +351,7 @@ const handleClose = async (id: number) => {
     await InspectionJobMainApi.closeInspectionJobMain(id)
     message.success(t('common.closeSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 /** 发布按钮操作 */
@@ -333,19 +363,19 @@ const handleRelease = async (id: number) => {
     await InspectionJobMainApi.releaseInspectionJobMain(id)
     message.success('发布成功！')
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 // 承接
 const handleAccept = async (id: number) => {
   try {
     // 承接的二次确认
-    await message.confirm(t('common.confirmAccept'))
+    // await message.confirm(t('common.confirmAccept'))
     // 发起承接
     await InspectionJobMainApi.acceptInspectionJobMain(id)
-    message.success(t('common.acceptSuccess'))
-    // 刷新列表
-    await getList()
+    // message.success(t('common.acceptSuccess'))
+    // 刷新列表(TB反馈，取消承接后刷新页面)
+    // buttonBaseClick('refresh', null)
   } catch {}
 }
 // 放弃任务
@@ -357,7 +387,7 @@ const handleAbandon = async (id: number) => {
     await InspectionJobMainApi.abandonInspectionJobMain(id)
     message.success(t('common.giveupSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 
@@ -401,7 +431,11 @@ const submitForm = async (formType, data) => {
     formRef.value.dialogVisible = false
     formRef.value.formLoading = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    } else {
+      buttonBaseClick('refresh', null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -415,19 +449,75 @@ const handleImport = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
+  if (!isHave) {
+    if (route.name == 'inspectionJobProductionMain') {
+      searchData.filters.push({
+        action: '==',
+        column: 'inspectionType',
+        value: '4'
+      })
+    } else if (route.name == 'inspectionJobPurchaseMain') {
+      searchData.filters.push({
+        action: '==',
+        column: 'inspectionType',
+        value: '1'
+      })
+    } else {
+      searchData.filters.push({
+        action: 'notIn',
+        column: 'excludeInspectionType',
+        value: '1,4'
+      })
+    }
+  }
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
   }
   getList() // 刷新当前列表
 }
-
 /** 初始化 **/
 onMounted(async () => {
-    tableObject.params = {
-    available: true
-  }
+  console.log(11,route.name)
+  if (route.name == 'inspectionJobProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else if (route.name == 'inspectionJobPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4'
+    }
+  }
+
   getList()
   // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
 })
+onActivated(() => {
+  if (route.name == 'inspectionJobProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else if (route.name == 'inspectionJobPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4'
+    }
+  }
+
+  getList()
+})
 </script>
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index baef7aaa7..0a89714df 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -272,7 +272,7 @@ export const InspectionJobMain = useCrudSchemas(
       label: '检验类型',
       field: 'inspectionType',
       sort: 'custom',
-      dictType: DICT_TYPE.INSPECTION_TYPE,
+      dictType: DICT_TYPE.INSPECTION_TYPE_NEW,
       dictClass: 'string',
       isSearch: true,
       form: {
@@ -567,6 +567,7 @@ export const InspectionJobMain = useCrudSchemas(
       dictClass: 'string',
       isForm: false,
       isTable: true,
+      isSearch: true,
       sort: 'custom',
       table: {
         width: 150
@@ -594,6 +595,17 @@ export const InspectionJobMain = useCrudSchemas(
         width: 110
       }
     },
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false,
+      tableForm: {
+        disabled: false
+      }
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -613,6 +625,15 @@ export const InspectionJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        }
       }
     },
     {
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index 1eb7ffef6..519f40e06 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -93,7 +93,16 @@ export const InspectionMethod = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
index 71ee2fd82..8e75df52d 100644
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -55,6 +55,7 @@
     :apiCreate="Q1Api.createQ1"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -77,6 +78,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 * as StdcostpriceApi from '@/api/wms/stdcostprice'
 
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -92,20 +94,45 @@ routeName.value = route.name
 const tableColumns = ref(Q1.allSchemas.tableColumns)
 
 // 查询页面返回
+const priceObj = ref()
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
+    nextTick(async () => {
     const setV = {}
     if (formField == 'customerCode') {
       setV['itemCode'] = ''
     }
     if (formField == 'itemCode') {
       setV['uom'] = val[0]['customerUom']
+      console.log(333,val[0].code)
+      const params = {
+        by: "ASC",
+        filters: [{column: "itemCode", action: "==", value: val[0].itemCode}],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ""
+      }
+      params.isSearch = true
+      StdcostpriceApi.getStdcostpricePage(params).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+          formRef.setValues({
+            claimAmount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
+          })
+        }
+        
+      })
     }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
   })
 }
 
+const onChange =(field,e)=>{
+  if (field == 'qty') {
+          basicFormRef.value.formRef.formModel.claimAmount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
+}
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
index 39fc07837..dd3461b55 100644
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -179,7 +179,7 @@ export const Q1 = useCrudSchemas(
       label: '编码',
       field: 'code',
       sort: 'custom',
-      dictType: DICT_TYPE.QMS_CODE,
+      dictType: DICT_TYPE.QMS_Q1_CODE,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
@@ -384,7 +384,16 @@ export const Q1 = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '操作',
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 55df4ad9f..f62948b2a 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -286,7 +286,7 @@ export const Q2 = useCrudSchemas(
       label: '编码',
       field: 'code',
       sort: 'custom',
-      dictType: DICT_TYPE.QMS_CODE,
+      dictType: DICT_TYPE.QMS_Q2_CODE,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
@@ -465,7 +465,16 @@ export const Q2 = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '操作',
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index 3754cb665..885ee2dc0 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -55,6 +55,7 @@
     :apiCreate="Q3Api.createQ3"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -77,6 +78,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 ProductionlineitemApi from '@/api/wms/productionlineitem'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -92,12 +95,43 @@ routeName.value = route.name
 const tableColumns = ref(Q3.allSchemas.tableColumns)
 
 // 查询页面返回
+const priceObj = ref()
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
+  nextTick(async () => {
     const setV = {}
     if (formField == 'itemCode') {
       console.log(val)
       setV['uom'] = val[0]['uom']
+      console.log(formRef.formModel.qty)
+      // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code)
+      ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => {
+        console.log(res)
+        if (res?.length > 0) {
+          formRef.formModel.defectLocation = res[0].productionLineCode
+          Q3.allSchemas.formSchema.forEach(item=>{
+            if (item.field == 'defectLocation') {
+              item.componentProps.options = res
+            }
+          })
+        }
+      })
+      const params = {
+        by: "ASC",
+        filters: [{column: "itemCode", action: "==", value: val[0].code}],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ""
+      }
+      params.isSearch = true
+      StdcostpriceApi.getStdcostpricePage(params).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+          formRef.setValues({
+            amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
+          })
+        }
+        
+      })
     }
     if (formField == 'q1Number') {
       //Q1通知单号
@@ -113,6 +147,11 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     }
   })
 }
+const onChange =(field,e)=>{
+  if (field == 'qty') {
+          basicFormRef.value.formRef.formModel.amount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
+}
+}
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index ad671293b..142deb01f 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -20,8 +20,14 @@ export const Q3Rules = reactive({
   qty: [required],
   code: [required],
   defectLocation: [required],
-  defectType: [required],
-  problemReason: [required],
+  defectType: [
+    { required: true, message: '缺陷类型不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  problemReason: [
+    { required: true, message: '问题原因不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   priority: [required],
   amount: [required],
   costCode: [required],
@@ -208,9 +214,9 @@ export const Q3 = useCrudSchemas(
       label: '编码',
       field: 'code',
       sort: 'custom',
-      dictType: DICT_TYPE.QMS_CODE,
+      dictType: DICT_TYPE.QMS_Q3_CODE,
       dictClass: 'string',
-      isSearch: false,
+      isSearch: true,
       isTable: true,
       tableForm: {
         type: 'Select'
@@ -220,36 +226,45 @@ export const Q3 = useCrudSchemas(
       label: '缺陷位置',
       field: 'defectLocation',
       sort: 'custom',
-      dictType: DICT_TYPE.DEFECT_LOCATION,
       dictClass: 'string',
       isSearch: false,
       isTable: false,
-      tableForm: {
-        type: 'Select'
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: [],
+          optionsAlias: {
+            labelField: 'productionLineName',
+            valueField: 'productionLineCode'
+          },
+          filterable: true,
+        }
       }
     },
     {
       label: '缺陷类型',
       field: 'defectType',
       sort: 'custom',
-      dictType: DICT_TYPE.DEFECT_TYPE,
-      dictClass: 'string',
       isSearch: false,
       isTable: false,
-      tableForm: {
-        type: 'Select'
+      table: {
+        width: '150'
+      },
+      form: {
+        component: 'Input'
       }
     },
     {
       label: '问题原因',
       field: 'problemReason',
       sort: 'custom',
-      dictType: DICT_TYPE.PROBLEM_REASON,
-      dictClass: 'string',
       isSearch: false,
       isTable: false,
-      tableForm: {
-        type: 'Select'
+      table: {
+        width: '150'
+      },
+      form: {
+        component: 'Input'
       }
     },
     {
@@ -383,8 +398,7 @@ export const Q3 = useCrudSchemas(
     {
       label: '创建时间',
       field: 'createTime',
-      isSearch: false,
-      isTable: false,
+      isTable: true,
       isForm: false,
       table: {
         width: 180
@@ -401,7 +415,16 @@ export const Q3 = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '操作',
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index d12d62079..75bc47e35 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -91,6 +91,15 @@
     :detailAllSchemasRules="InspectionRecordPackageRules"
     :list="list"
   />
+  <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -116,6 +125,7 @@ import UseAddForm from './useAddForm.vue'
 import AddForm from './addForm.vue'
 import Detail from './detail.vue'
 import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
+import { getReportUrl } from '@/utils/systemParam'
 
 import {
   InspectionJobMain,
@@ -163,7 +173,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 let HeadButttondata = [
-  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-recode-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -234,8 +244,8 @@ const butttondata = (row) => {
     // hide:row.useDecision,
     // hasPermi: 'qms:inspection-recode-main:execute',
     //  }), // 执行
-    // defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }) // 编辑
-     defaultButtons.mainListEditBtn(null) // 编辑
+    defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑
+    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
   ]
 }
 
@@ -249,13 +259,13 @@ const buttonTableClick = async (val, row) => {
     // 编辑
     // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
     if (row.estimateCode == 1) {
-      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
         }
       })
     } else if (row.estimateCode == 2) {
-      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
         }
@@ -279,12 +289,24 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainOrderPub') {
     //发布
     handleOrderPub(row)
+  } else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
   } else if (val == 'edit') {
     //修改
     // 执行
     execute('execute', row)
   }
 }
+
+// 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
+}
 /** 添加/修改操作 */
 const basicFormRef = ref()
 // const openForm = async (type : string, row ?: number) => {
@@ -293,8 +315,10 @@ const basicFormRef = ref()
 // }
 /** 使用决策操作操作 */
 const formRef = ref()
+const rowData = ref()
 const openUseForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  rowData.value = row
   formRef.value.open(type, row)
 }
 
@@ -371,6 +395,7 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
+    handleOrderPub(rowData.value)
     // 刷新当前列表
     getList()
   } finally {
@@ -404,11 +429,34 @@ const submitFormExecute = async (formType, data) => {
 const searchFormClick = (searchData) => {
   let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType')
   if (!isHave) {
-    searchData.filters.push({
-      action: '!=',
+    if (route.name == 'inspectionRecordPurchaseMain') {
+     searchData.filters.push({
+      action: '==',
+      column: 'inspectionType',
+      value: '1'
+    },{
+      action: '==',
+      column: 'available',
+      value: true
+    })
+  } else if (route.name == 'inspectionRecordProductionMain') {
+      searchData.filters.push({
+      action: '==',
       column: 'inspectionType',
-      value: '11'
+      value: '4'
+    },{
+      action: '==',
+      column: 'available',
+      value: true
     })
+  } else {
+      searchData.filters.push({
+      action: 'notIn',
+      column: 'inspectionType',
+      value: '1,4,11'
+    })
+  }
+  
   }
   tableObject.params = {
     isSearch: true,
@@ -419,10 +467,43 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  tableObject.params = {
-    available: true,
-    excludeInspectionType: '11'
+  if (route.name == 'inspectionRecordPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else if (route.name == 'inspectionRecordProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4,11'
+    }
   }
+
+  getList()
+})
+onActivated(() => {
+  if (route.name == 'inspectionRecordPurchaseMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '1'
+    }
+  } else if (route.name == 'inspectionRecordProductionMain') {
+    tableObject.params = {
+      available: true,
+      inspectionType: '4'
+    }
+  } else {
+    tableObject.params = {
+      available: true,
+      excludeInspectionType: '1,4,11'
+    }
+  }
+
   getList()
 })
 </script>
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 8ede0bdc3..9c106671b 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -58,7 +58,7 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'asnNumber',
       sort: 'custom',
       isSearch: true,
-      isForm:false,
+      isForm: false,
       form: {
         componentProps: {
           disabled: true
@@ -245,7 +245,6 @@ export const InspectionRecordMain = useCrudSchemas(
         componentProps: {
           disabled: true
         }
-
       },
       table: {
         width: 150
@@ -277,7 +276,6 @@ export const InspectionRecordMain = useCrudSchemas(
         componentProps: {
           disabled: true
         }
-
       },
       table: {
         width: 150
@@ -294,7 +292,6 @@ export const InspectionRecordMain = useCrudSchemas(
         componentProps: {
           disabled: true
         }
-
       },
       table: {
         width: 150
@@ -421,7 +418,7 @@ export const InspectionRecordMain = useCrudSchemas(
         componentProps: {
           type: 'datetime',
           valueFormat: 'x',
-              disabled: true
+          disabled: true
         }
       },
       detail: {
@@ -499,7 +496,7 @@ export const InspectionRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isForm:false
+      isForm: false
     },
     {
       label: '执行结果',
@@ -516,6 +513,17 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false,
+      tableForm: {
+        disabled: false
+      }
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -535,6 +543,15 @@ export const InspectionRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        }
       }
     },
     {
@@ -586,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 250,
+        width: 300,
         fixed: 'right'
       }
     }
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index ebcab9ac7..4f4777f9a 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -715,6 +715,7 @@ if (props.basicFormWidth) {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
 const rules = ref({
+  inspectionSchemeCode: [{ required: true, message: '请选择检验方案', trigger: 'blur' }],
   inspectionTime: [{ required: true, message: '请选择检验时间', trigger: 'blur' }],
   'inspectionJobCharacteristicsUpdateReqVO.description': [
     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 2ed3dbac1..0f124b412 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -1,7 +1,12 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectionRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="InspectionRecordMain.allSchemas.searchSchema" @search="setSearchParams" 
+    @reset="setSearchParams({
+          available: true,
+      inspectionType:'11'
+        })"
+      />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -49,6 +54,15 @@
   <!-- 包装信息 --> <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionRecordMain.allSchemas"
     :detailAllSchemas="InspectionRecordPackage.allSchemas" :detailAllSchemasRules="InspectionRecordPackageRules"
     :list="list"/>
+      <el-dialog
+      v-model="showQualityReport"
+      :title="t('质检明细')"
+      :append-to-body="false"
+      destroy-on-close
+      fullscreen
+    >
+    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -62,6 +76,7 @@
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import AddForm from '../inspectionRecordFirst/addForm.vue'
   import Detail from './detail.vue'
+  import { getReportUrl } from '@/utils/systemParam'
 
 import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
 
@@ -139,8 +154,8 @@ const buttonBaseClick = (val, item) => {
     defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑
       defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:delete' }), // 删除
       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi: 'qms:inspection-recode-first-main:pub' }), // 发布
-      
-      defaultButtons.mainExport({ hide: !row.isPublished}), // 导出
+      defaultButtons.mainExport({ hide: !row.isPublished }),// 导出
+     defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 
     ]
   }
 
@@ -156,11 +171,22 @@ const buttonBaseClick = (val, item) => {
       handleDelete(row.id)
     }else if (val == 'mainOrderPub') { //发布
       handleOrderPub(row)
-    }else if (val == 'mainExport') {
+    }else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
+  } else if (val == 'mainExport') {
     // 导出
     handleMainExport(row)
   } 
-  }
+}
+  // 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
+}
  /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = async (type : string, row ?: number) => {
@@ -217,7 +243,7 @@ const handleMainExport = async (row: any) => {
 }
 
 
-  /** 导出按钮操作 */
+   /** 导出按钮操作 */
   const handleExport = async () => {
     try {
       // 导出的二次确认
diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
index d04beffe3..59f1c6049 100644
--- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
+++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
@@ -29,7 +29,7 @@ export const InspectionRecordMain = useCrudSchemas(
       isSearch: false,
       table: {
         width: 150
-      },
+      }
     },
     {
       label: '物料编码',
@@ -81,8 +81,7 @@ export const InspectionRecordMain = useCrudSchemas(
         width: 200
       }
     },
-    
-   
+
     {
       label: '检验人',
       field: 'creator',
@@ -123,7 +122,6 @@ export const InspectionRecordMain = useCrudSchemas(
           type: 'daterange',
           dateFormat: 'YYYY-MM-DD',
           valueFormat: 'YYYY-MM-DD'
-          
         }
       },
       form: {
@@ -136,13 +134,38 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false,
+      tableForm: {
+        disabled: false
+      }
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      table: {
+        width: 180
+      }
+    },
     {
       label: '操作',
       field: 'action',
       isForm: false,
       isDetail: false,
       table: {
-        width: 200,
+        width: 300,
         fixed: 'right'
       }
     }
@@ -271,7 +294,11 @@ export const InspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
+    isTable: true,
+    table: {
+      width: 180,
+    },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index 9bd7af9cb..5f7dc751d 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -5,7 +5,9 @@
       <Search
         :schema="InspectionMain.allSchemas.searchSchema"
         @search="setSearchParams"
-        @reset="setSearchParams"
+        @reset="setSearchParams({
+          available: true
+        })"
       />
     </ContentWrap>
 
@@ -148,7 +150,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // 新增
   // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-request-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -175,8 +177,9 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') {
     // 刷新
-    tableObject.params.isSearch = false
-    tableObject.params.filters = ''
+    // tableObject.params.isSearch = false
+    // tableObject.params.filters = ''
+    console.log(tableObject.params)
     getList()
   } else if (val == 'filtrate') {
     // 筛选
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index 6d0b11612..bdb62d65b 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -250,14 +250,16 @@ export const InspectionMain = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
@@ -300,14 +302,16 @@ export const InspectionMain = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
@@ -436,8 +440,8 @@ export const InspectionMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: 'aql',
-      field: 'aql',
+      label: 'AQL值',
+      field: 'aqlValue',
       sort: 'custom',
       dictType: DICT_TYPE.BASIC_AQL,
       dictClass: 'string',
@@ -445,6 +449,19 @@ export const InspectionMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
     {
       label: '是否可用',
       field: 'available',
@@ -467,6 +484,19 @@ export const InspectionMain = useCrudSchemas(
         width: 110
       }
     },
+
+    {
+      label: '包装号',
+      field: 'packageCode',
+      sort: 'custom',
+      isSearch: true,
+      isTable: false,
+      isForm: false,
+      tableForm: {
+        disabled: false
+      }
+    },
+
     {
       label: '创建时间',
       field: 'createTime',
@@ -486,6 +516,15 @@ export const InspectionMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        }
       }
     },
     {
diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index 950e2c522..ef85d8566 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -820,7 +820,7 @@ const rules = ref({
   programmeTemplateCode: [
     { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] }
   ],
-  description: [{ required: true, message: '请选择描述', trigger: 'blur' }],
+  description: [{ required: false, message: '请选择描述', trigger: 'blur' }],
   // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
   aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
   inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
@@ -1371,7 +1371,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         data.value.samplePieceSize = 1
         isSamplePieceSizeDisabled.value = false
       }
-      data.value.description = val[0].desc1
+      // data.value.description = val[0].desc1
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
@@ -1478,7 +1478,7 @@ const onItemBlur= async (field, pageApi, item) => {
     const obj = array.list[0]
     if (obj) {
       dataObj['itemName'] = obj.name
-      dataObj['description'] = obj.desc1
+      // dataObj['description'] = obj.desc1
     } else {
       message.alert('暂无数据')
       dataObj[field + 'Code'] = ''
diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
index 65bd50c43..07badf137 100644
--- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
@@ -221,7 +221,16 @@ export const InspectionSchemeMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
index 4795f8a1f..ccf501190 100644
--- a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
+++ b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
@@ -96,7 +96,16 @@ export const InspectionTemplateMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 9c624b22a..44795cfe0 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -139,7 +139,16 @@ export const SampleCode = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index 0951c8a62..623ac34c3 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -122,7 +122,16 @@ export const SamplingProcess = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index 5f74a0307..30edb172f 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -66,7 +66,16 @@ export const SamplingScheme = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/qms/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts
index ef6b7ea7d..b815c9753 100644
--- a/src/views/qms/selectedSet/selectedSet.data.ts
+++ b/src/views/qms/selectedSet/selectedSet.data.ts
@@ -68,7 +68,16 @@ export const SelectedSet = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue
index 3dec54e48..2095c5d07 100644
--- a/src/views/system/serialNumber/index.vue
+++ b/src/views/system/serialNumber/index.vue
@@ -99,6 +99,9 @@
 import download from '@/utils/download'
 import * as SerialNumberApi from '@/api/system/serialNumber'
 import SerialNumberForm from './SerialNumberForm.vue'
+import { formatDate } from '@/utils/formatTime'
+
+const route = useRoute() //路由信息
 
 defineOptions({ name: 'SerialNumber' })
 
@@ -168,7 +171,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SerialNumberApi.exportSerialNumber(queryParams)
-    download.excel(data, '流水号规则.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue
index 6a8d47ec8..a5b4eef33 100644
--- a/src/views/system/systemInstallPackage/index.vue
+++ b/src/views/system/systemInstallPackage/index.vue
@@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:system-install-package:update'}), // 编辑
-  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:system-install-package:delete'}), // 删除
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:system-install-package:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index e2650dbe4..aba13417d 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -104,6 +104,8 @@ import download from '@/utils/download'
 import * as TenantApi from '@/api/system/tenant'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import TenantForm from './TenantForm.vue'
+import { formatDate } from '@/utils/formatTime'
+const route = useRoute() //路由信息
 
 defineOptions({ name: 'SystemTenant' })
 
@@ -177,7 +179,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TenantApi.exportTenant(queryParams)
-    download.excel(data, '租户列表.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 361595667..541a7f3ef 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -29,6 +29,10 @@
               start-placeholder="开始日期" end-placeholder="结束日期" class="!w-240px" />
           </el-form-item>
           <el-form-item>
+            <el-form-item label="用户昵称" prop="nickeName">
+            <el-input v-model="queryParams.nickeName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery"
+              class="!w-240px" />
+          </el-form-item>
             <el-button type="info" plain @click="handleQuery">
               <Icon icon="ep:search" />搜索
             </el-button>
@@ -125,7 +129,8 @@ const queryParams = reactive({
   mobile: undefined,
   status: undefined,
   deptId: undefined,
-  createTime: []
+  createTime: [],
+  nickeName:undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue
index 1a35d6065..11bc4ff83 100644
--- a/src/views/wms/agvManage/agvLocationrelation/index.vue
+++ b/src/views/wms/agvManage/agvLocationrelation/index.vue
@@ -69,6 +69,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: 'AgvLocationrelation' })
 
@@ -128,7 +129,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -202,7 +209,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -220,7 +231,7 @@ const handleDelete = async (id: number) => {
     await AgvLocationrelationApi.deleteAgvLocationrelation(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -233,7 +244,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
-    download.excel(data, 'AGV库位转换.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -248,7 +259,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'AGV库位转换导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
index e99169502..7f0add9a9 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
@@ -244,7 +244,7 @@ export const Customer = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -267,7 +267,7 @@ export const Customer = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue
index a2a85341c..68b5433ec 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue
@@ -67,6 +67,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: 'Customer' })
 
@@ -195,7 +196,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -215,7 +220,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -229,7 +234,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CustomerApi.exportCustomer(tableObject.params)
-    download.excel(data, '客户 .xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -244,7 +249,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '客户导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
index cda8e2e8e..1884f5fa9 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts
@@ -116,6 +116,9 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180,
+    },
     isForm: false,
     form: {
       component: 'DatePicker',
@@ -125,6 +128,15 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
index 1a56ece5c..dadcab5b5 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
@@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => {
 
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -198,7 +208,7 @@ const handleDelete = async (id: number) => {
     await CustomerDeliveryForecastApi.deleteCustomerDeliveryForecast(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index 4ece20cf8..55f5941d9 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -296,7 +296,7 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -319,7 +319,7 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
index bff35210f..80467ff01 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@@ -66,6 +66,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: 'Customerdock' })
 
@@ -198,7 +199,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -230,7 +235,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -243,7 +248,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CustomerdockApi.exportCustomerdock(tableObject.params)
-    download.excel(data, '客户月台.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -258,7 +263,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '客户月台导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 396528e7b..5372ea34b 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -284,7 +284,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -307,7 +307,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
index 1888b081a..5f3a1e2d8 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -71,6 +71,7 @@ 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 '../../itemManage/itembasic/itembasic.data'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Customeritem' })
 
@@ -204,7 +205,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 const onEnter = async (field,value)=>{
   console.log(field,value)
@@ -254,7 +259,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -267,7 +272,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CustomeritemApi.exportCustomeritem(tableObject.params)
-    download.excel(data, '客户物料 .xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -282,7 +287,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '客户物料导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index 1f7f8010a..1e458f4da 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -66,6 +66,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: 'Project' })
 
@@ -195,7 +196,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -224,7 +229,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -237,7 +242,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProjectApi.exportProject(tableObject.params)
-    download.excel(data, '项目.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -252,7 +257,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '项目导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
index 70b4ca87c..d54cd7751 100644
--- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -163,7 +163,7 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -186,7 +186,7 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
index 29b1ac834..aa46ba845 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
@@ -66,6 +66,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: 'Saleprice' })
 
@@ -199,7 +200,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -228,7 +233,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -241,7 +246,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SalepriceApi.exportSaleprice(tableObject.params)
-    download.excel(data, '销售价格单.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -256,7 +261,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '销售价格单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index f298961eb..6b01575b9 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -222,7 +222,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -245,7 +245,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index f16aa82a2..7c895365b 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -78,6 +78,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 // 业务类型
 defineOptions({ name: 'Businesstype' })
@@ -287,7 +288,7 @@ const formsSuccess = async (formType, submitData) => {
       .then(async () => {
         message.success(t('common.updateSuccess'))
         basicFormRef.value.dialogVisible = false
-        await getList()
+        buttonBaseClick('refresh',null)
       })
       .catch(() => {
         data.itemTypes = data.itemTypes.split(',')
@@ -352,7 +353,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -365,7 +366,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BusinesstypeApi.exportBusinesstype(tableObject.params)
-    download.excel(data, '业务类型.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -380,7 +381,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '业务类型导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
index 1950075a3..d964b38d3 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/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: 'Documentsetting' })
 
@@ -176,7 +177,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -196,7 +201,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -209,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params)
-    download.excel(data, '单据设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -224,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '单据设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
index 6b8df2456..337fddd23 100644
--- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/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: 'Jobsetting' })
 
@@ -176,7 +177,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -196,7 +201,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -209,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobsettingApi.exportJobsetting(tableObject.params)
-    download.excel(data, '任务单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -224,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '任务单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
index dfcf9269b..95d113bb5 100644
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/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: 'Plansetting' })
 
@@ -177,7 +178,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -197,7 +202,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -210,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PlansettingApi.exportPlansetting(tableObject.params)
-    download.excel(data, '计划单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '计划单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
index ec3da3e17..ccbff8cf7 100644
--- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/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: 'Recordsetting' })
 
@@ -177,7 +178,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -197,7 +202,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -210,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RecordsettingApi.exportRecordsetting(tableObject.params)
-    download.excel(data, '记录单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '记录单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
index 1eac21e51..a2dd02bf3 100644
--- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/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: 'Requestsetting' })
 
@@ -177,7 +178,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -197,7 +202,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -210,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RequestsettingApi.exportRequestsetting(tableObject.params)
-    download.excel(data, '申请单设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '申请单设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
index 49dfc5f62..c96e1a0d3 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/switch/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: 'Switch' })
 
@@ -176,7 +177,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -189,7 +190,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SwitchApi.exportSwitch(tableObject.params)
-    download.excel(data, '单据开关.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -204,7 +205,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '单据开关导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -225,7 +226,7 @@ const success = async (formType, data) => {
     const res =  await SwitchApi.updateSwitch(data)
     if(true===res){
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }else{
       message.error('修改失败')
     }
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
index 78a9c6374..31fe19489 100644
--- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/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: 'Transactiontype' })
 
@@ -178,7 +179,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -198,7 +203,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -211,7 +216,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TransactiontypeApi.exportTransactiontype(tableObject.params)
-    download.excel(data, '事务类型.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -226,7 +231,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '事务类型导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index dfa823146..257a5f71a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -214,7 +214,7 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 2e2135bc6..b6f94685a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -68,6 +68,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: 'Area' })
 
@@ -201,7 +202,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -230,7 +235,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -243,7 +248,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AreaApi.exportArea(tableObject.params)
-    download.excel(data, '库区.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -258,7 +263,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库区导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index dbbc72a7a..11a7c465a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -252,7 +252,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -275,7 +275,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
index 7938b20bb..c968f25c4 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -70,6 +70,7 @@ 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'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Dock' })
 
@@ -230,7 +231,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 删除按钮操作 */
@@ -244,7 +249,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -257,7 +262,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DockApi.exportDock(tableObject.params)
-    download.excel(data, '月台.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -272,7 +277,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '月台导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
index 2567a8018..14700c5cb 100644
--- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -59,6 +59,7 @@ import download from '@/utils/download'
 import { Enterprise,EnterpriseRules } from './enterprise.data'
 import * as EnterpriseApi from '@/api/wms/enterprise'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Enterprise' })
 
@@ -229,7 +230,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await EnterpriseApi.exportEnterprise(tableObject.params)
-    download.excel(data, '企业.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index 195c1bbee..2ac2ee173 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -66,6 +66,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: 'Location' })
@@ -219,7 +220,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -248,7 +253,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -261,7 +266,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LocationApi.exportLocation(tableObject.params)
-    download.excel(data, '库位.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -276,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库位导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 1a74eea06..07ef0409c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -392,7 +392,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -415,7 +415,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
index 7af3ab2f0..40785ee97 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -66,6 +66,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: 'Locationgroup' })
@@ -200,7 +201,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -229,7 +234,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -242,7 +247,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LocationgroupApi.exportLocationgroup(tableObject.params)
-    download.excel(data, '库位组.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -257,7 +262,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '库位组导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index da5fdfbd5..70ee060af 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -214,7 +214,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index a076365ef..40731066f 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -66,6 +66,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: 'Process' })
 
@@ -207,7 +208,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -236,7 +241,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -249,7 +254,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProcessApi.exportProcess(tableObject.params)
-    download.excel(data, '工序.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -264,7 +269,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工序导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
index 7f4690a51..6db2fb2f5 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
@@ -217,7 +217,7 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -240,7 +240,7 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index 1da242abe..3a916a03c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -66,6 +66,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: 'Productionline' })
@@ -200,7 +201,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -229,7 +234,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -242,7 +247,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionlineApi.exportProductionline(tableObject.params)
-    download.excel(data, '生产线.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -257,7 +262,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产线导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index 1e17db6d5..72cee3e30 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -227,7 +227,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -250,7 +250,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
index c176cd9f1..c1549165d 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/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: 'Warehouse' })
 
@@ -189,7 +190,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -209,7 +214,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -222,7 +227,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WarehouseApi.exportWarehouse(tableObject.params)
-    download.excel(data, '仓库.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -237,7 +242,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '仓库导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
index ffb93df3e..3f82b7907 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -156,7 +156,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -179,7 +179,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
index 10a23c941..3a8fc9f96 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/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: 'Workshop' })
 
@@ -191,7 +192,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -211,7 +216,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -224,7 +229,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WorkshopApi.exportWorkshop(tableObject.params)
-    download.excel(data, '车间.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -239,7 +244,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '车间导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
index b7ea81be4..569ded4e1 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
@@ -124,7 +124,7 @@ export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -147,7 +147,7 @@ export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 0415294f6..d200d5f0a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -66,6 +66,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: 'Workstation' })
@@ -209,7 +210,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -238,7 +243,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -251,7 +256,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await WorkstationApi.exportWorkstation(tableObject.params)
-    download.excel(data, '工位.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -266,7 +271,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '工位导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index b8da1ff1c..cebf01a68 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -302,7 +302,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -325,7 +325,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index a94d3709a..9fd1cfb5d 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -255,7 +255,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -278,7 +278,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
index 7f21ff7b8..3e09a60d6 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -68,6 +68,7 @@ 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 ProcessApi from "@/api/wms/process";
+import { formatDate } from '@/utils/formatTime'
 
 // 物料清单bom
 defineOptions({ name: 'Bom' })
@@ -206,7 +207,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -241,7 +246,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -254,7 +259,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BomApi.exportBom(tableObject.params)
-    download.excel(data, '物料清单信息 .xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -269,7 +274,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料清单信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 8a71dfb8e..58ac68e13 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -42,7 +42,6 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
-    @success="getList"
     :rules="ItemareaRules"
     :isOpenSearchTable="true"
     fieldTableColumn="locationCode"
@@ -52,13 +51,13 @@
     :tableData="tableData"
     :apiUpdate="ItemareaApi.updateItemarea"
     :apiCreate="ItemareaApi.createItemarea"
-    :isBusiness="true"
+    :isBusiness="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
+    @success="submitForm"
     :isShowButton = isShowButton
     :basicFormWidth="75"
     :tableFormDataLength="false"
@@ -68,7 +67,7 @@
   <Detail
     ref="detailRef"
     :isOpenSearchTable="true"
-    :isBasic="false"
+    :isBasic="true"
     :allSchemas="Itemarea.allSchemas"
     :detailAllSchemas="ItemareaDetail.allSchemas"
     :detailAllSchemasRules="ItemareaDetailRules"
@@ -97,8 +96,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   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 Detail from '@/components/Detail/src/Detail.vue' 
+  import { formatDate } from '@/utils/formatTime'
 
 // 发货申请
 defineOptions({ name: 'Itemarea' })
@@ -323,7 +322,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -336,7 +335,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItemareaApi.exportItemarea(tableObject.params)
-    download.excel(data, '物料库区配置管理主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -380,7 +379,11 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -395,7 +398,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料库区配置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index cbad1aab2..df0380761 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -669,7 +669,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     },
@@ -680,7 +680,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: false,
-    isTable: false,
+    isTable: true,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -693,7 +693,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     sort: 'custom',
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index 2a331987c..8d0763ed5 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -88,6 +88,9 @@ import { Expectin } from '@/views/wms/inventoryManage/expectin/expectin.data'
 import * as ExpectinApi from '@/api/wms/expectin'
 
 
+import { formatDate } from '@/utils/formatTime'
+
+
 //物料基础信息
 defineOptions({ name: 'Itembasic' })
 
@@ -185,7 +188,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料基础信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
@@ -248,7 +251,11 @@ const formsSuccess = async (formType,data) => {
   basicFormRef.value.formLoading = false
 
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 const detailRef = ref()
@@ -268,7 +275,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 
@@ -280,7 +287,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItembasicApi.exportItembasic(tableObject.params)
-    download.excel(data, '物料基本信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 70754360d..7eb18b2ea 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -48,7 +48,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '描述1',
+    label: '方案描述',
     field: 'desc1',
     sort: 'custom',
     table: {
@@ -433,13 +433,16 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 180
+    },
   },
   {
     label: '最后更新时间',
     field: 'updateTime',
     sort: 'custom',
-    isTable: false,
+    isTable: true,
     isDetail: true,
     formatter: dateFormatter,
     isForm: false,
@@ -464,7 +467,10 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false
+    isTable: true,
+    table: {
+      width: 180
+    },
   },
   { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index e6fc7f1dc..c463d4ef0 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -81,6 +81,7 @@ 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'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Itempackaging' })
 
@@ -235,7 +236,11 @@ const formsSuccess = async (formType, data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 const onEnter = async (field,value)=>{
   console.log('onEnter',field,value)
@@ -304,8 +309,12 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
-  } catch {}
+    buttonBaseClick('refresh',null)
+  } catch {
+    tableObject.loading = false
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 /** 导出按钮操作 */
@@ -317,7 +326,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItempackagingApi.exportItempackaging(tableObject.params)
-    download.excel(data, '物料包装信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -332,7 +341,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料包装信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index bc2db8a9f..d023d27c8 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -256,7 +256,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -279,7 +279,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
index c2c403729..4b79e6768 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -67,6 +67,7 @@ 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 WarehouseApi from "@/api/wms/warehouse";
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Itemwarehouse' })
 
@@ -229,7 +230,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
-    download.excel(data, '物料仓库默认配置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -244,7 +245,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料仓库默认配置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 5904d8b09..569282c90 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -66,6 +66,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: 'Packageunit' })
 
@@ -128,7 +129,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -224,7 +231,11 @@ const formsSuccess = async (formType,data) => {
   }
   basicFormRef.value.formLoading = false
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -242,7 +253,7 @@ const handleDelete = async (id: number) => {
     await PackageunitApi.deletePackageunit(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -255,7 +266,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PackageunitApi.exportPackageunit(tableObject.params)
-    download.excel(data, '物品包装规格信息 .xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -270,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物品包装规格信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 9e10f82c3..70d24363b 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -199,7 +199,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -222,7 +222,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
@@ -543,7 +543,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -566,7 +566,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
index ca030de9f..bbe62e804 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/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: 'ProductionitemcodeSpareitemcode' })
 
@@ -124,7 +125,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -198,7 +205,11 @@ const formsSuccess = async (formType,data) => {
   }
   basicFormRef.value.formLoading = false
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -216,7 +227,7 @@ const handleDelete = async (id: number) => {
     await ProductionitemcodeSpareitemcodeApi.deleteProductionitemcodeSpareitemcode(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -229,7 +240,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionitemcodeSpareitemcodeApi.exportProductionitemcodeSpareitemcode(tableObject.params)
-    download.excel(data, '量产件备件关系.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -244,7 +255,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '量产件备件关系导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
index 3d6f1be35..2e780eb83 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
@@ -129,6 +129,40 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
index a04119f7e..ef76ed617 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@@ -66,6 +66,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: 'Productionlineitem' })
@@ -199,7 +200,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -228,7 +233,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -241,7 +246,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params)
-    download.excel(data, '生产线物料关系.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -256,7 +261,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产线物料关系导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index b429541ac..34b928016 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -246,7 +246,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -269,7 +269,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
index 3fe661ce1..f7f140876 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
@@ -147,7 +147,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -193,7 +199,11 @@ const submitForm = async (formType,data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -211,7 +221,7 @@ const handleDelete = async (id: number) => {
     await RelegateRecordMainApi.deleteRelegateRecordMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
index a8fd06e38..a5895cc41 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
@@ -117,6 +117,27 @@ export const RelegateRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    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')]
+      },
+    },
+
+
+  },
 ]))
 // 表单校验
 export const RelegateRecordDetailRules = reactive({
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 36dc35d9d..f428ff66e 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -364,7 +364,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -417,7 +423,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -428,7 +434,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -439,7 +445,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -450,7 +456,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -461,7 +467,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -485,7 +491,7 @@ const buttonTableClick = async (val, row) => {
     RelegateRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -630,7 +636,11 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     basicFormRef.value.dialogVisible = false
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
@@ -674,7 +684,7 @@ const handleDelete = async (id: number) => {
     await RelegateRequestMainApi.deleteRelegateRequestMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 7d06ecb7e..5241b48fd 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -106,6 +106,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -118,7 +119,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     isForm: false,
-    isTable: false
+    isTable: true
   },
   {
     label: '扩展属性',
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
index 48e5c9bae..8e6a052a0 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
@@ -67,6 +67,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: 'Stdcostprice' })
@@ -192,8 +193,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.dialogVisible = false
       basicFormRef.value.formLoading = false
-
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -222,7 +226,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -235,7 +239,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await StdcostpriceApi.exportStdcostprice(tableObject.params)
-    download.excel(data, '标准成本价格单 .xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -250,7 +254,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '标准成本价格单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index 2ea5edca4..c8bc2b996 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -198,7 +198,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -221,7 +221,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
index 2b4f6ec11..a164b20d8 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barcode/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: 'Barcode' })
 
@@ -181,7 +182,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -201,7 +206,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -214,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarcodeApi.exportBarcode(tableObject.params)
-    download.excel(data, '条码片段.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -230,7 +235,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '条码片段导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index bfe9bf270..f1130fc6f 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -79,6 +79,7 @@ import * as PackageApi from '@/api/wms/package'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 叫料标签
 defineOptions({ name: 'Callmaterials' })
 
@@ -183,7 +184,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else if (val=='selection_point'){//批量打印
     handleSelectionPoint()
@@ -249,7 +256,11 @@ const formsSuccess = async (formType,data) => {
   }
 
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -267,7 +278,7 @@ const handleDelete = async (id: number) => {
     await CallmaterialsApi.deleteCallmaterials(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -280,7 +291,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
-    download.excel(data, '叫料标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -328,7 +339,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '叫料标签导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
index f50ffea94..ae1e548e7 100644
--- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
@@ -183,7 +183,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 // 查询页面返回
@@ -212,7 +216,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index b9607c6ff..50c977fc7 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -54,6 +54,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackaging'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 库位标签
 defineOptions({ name: 'LocationLabel' })
@@ -164,7 +165,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -177,7 +178,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '库位标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 1abf79216..bda0f5106 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -67,6 +67,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -154,6 +155,7 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
+    debugger
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -233,7 +235,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -241,12 +243,13 @@ const handleDelete = async (id: number) => {
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
+    debugger
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '制造件件标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -302,7 +305,11 @@ const formsSuccess = async (formType,data) => {
   }
   
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 导入 */
@@ -314,7 +321,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 14ddbd0ed..a755d2bea 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -68,6 +68,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -234,7 +235,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -247,7 +248,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '采购件标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -298,7 +299,11 @@ const formsSuccess = async (formType,data) => {
   }
   
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 导入 */
@@ -310,7 +315,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index 90eaa3478..68424897e 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -64,6 +64,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Package,PackageRules } from './utensilPackage.data'
 import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 器具标签
 defineOptions({ name: 'UtensilPackage' })
@@ -216,7 +217,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -229,7 +230,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '器具标签.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -252,7 +253,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index dcd05eb8b..84931c430 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/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: 'Carrier' })
 
@@ -196,7 +197,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -216,7 +221,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -229,7 +234,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CarrierApi.exportCarrier(tableObject.params)
-    download.excel(data, '承运商.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -244,7 +249,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '承运商导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index 32c90fb63..d217f2ac4 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/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: 'Owner' })
 
@@ -197,7 +198,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -217,7 +222,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -230,7 +235,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OwnerApi.exportOwner(tableObject.params)
-    download.excel(data, '货主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -245,7 +250,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '货主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index 4ba329af0..8e18c295d 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -203,7 +203,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -223,7 +227,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index 01b077a75..c6892a584 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -68,6 +68,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import TeamForm from "@/views/wms/basicDataManage/orderManage/team/teamForm.vue";
 import {sync} from "rimraf";
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Team' })
 
@@ -188,7 +189,11 @@ const formsSuccess = async (formType,data) => {
         message.success(t('common.updateSuccess'))
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 const getData = async() => {
   getList();
@@ -211,7 +216,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -224,7 +229,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TeamApi.exportTeam(tableObject.params)
-    download.excel(data, '班组.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -239,7 +244,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '班组导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 89b6d5fe8..1b0e3e4e5 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -75,6 +75,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Configurationsetting' })
 
@@ -210,7 +211,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
-    download.excel(data, '配置设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +226,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '配置设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index 6eeaa78b1..95ca3b253 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -66,6 +66,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Paramsetting' })
 
@@ -181,7 +182,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ParamsettingApi.exportParamsetting(tableObject.params)
-    download.excel(data, '参数设置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -196,7 +197,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '参数设置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
index fa1d9922e..ae0ed0844 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -74,6 +74,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: 'Rule' })
 
@@ -176,7 +177,11 @@ const formsSuccess = async (formType, data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -196,7 +201,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -209,7 +214,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RuleApi.exportRule(tableObject.params)
-    download.excel(data, '规则.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -224,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '规则导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
index 1b306e0a9..7df989b6a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
@@ -106,7 +106,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
index e1a580c7d..bc85162de 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
@@ -106,7 +106,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
index 730760adb..cdf7fcb76 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
@@ -108,7 +108,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
index 77b078fe9..dd7fa9f1a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
@@ -107,7 +107,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
index 3444efabc..c2c9c958c 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
@@ -107,7 +107,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
index 4d0f74dd4..fa3ad01de 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
@@ -106,7 +106,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index b6b18e322..0d8c6776a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -107,7 +107,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index e4d5a6c92..690f7fd36 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -108,7 +108,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
index ccc2777aa..bcddf5f6a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
@@ -106,7 +106,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
index 88d59eab1..c8d4a5005 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
@@ -107,7 +107,7 @@ const handleDelete = async (id: number) => {
     await RuleApi.deleteRule(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch { }
 }
 // 列表头部按钮
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
index ca220e13a..3ee5a05ec 100644
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/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: 'Mstr' })
 
@@ -124,7 +125,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -171,7 +178,11 @@ const formsSuccess = async (formType,data) => {
   }
   
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -189,7 +200,7 @@ const handleDelete = async (id: number) => {
     await MstrApi.deleteMstr(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -202,7 +213,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await MstrApi.exportMstr(tableObject.params)
-    download.excel(data, '产品类信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -217,7 +228,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '产品类信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
index d0b0f19c9..a50649fbb 100644
--- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadCostcentre/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: 'QadCostcentre' })
 
@@ -124,7 +125,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -180,7 +187,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -198,7 +209,7 @@ const handleDelete = async (id: number) => {
     await QadCostcentreApi.deleteQadCostcentre(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -211,7 +222,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await QadCostcentreApi.exportQadCostcentre(tableObject.params)
-    download.excel(data, 'QAD成品中心.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -226,7 +237,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'QAD成品中心导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue
index f34285ac2..b5d878efb 100644
--- a/src/views/wms/basicDataManage/subject/qadProject/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadProject/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: 'QadProject' })
 
@@ -124,7 +125,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -180,7 +187,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -211,7 +222,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await QadProjectApi.exportQadProject(tableObject.params)
-    download.excel(data, 'QAD项目信息.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -226,7 +237,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'QAD项目信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
index 96ceefbac..db7621df2 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/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: 'SubjectAccount' })
 
@@ -133,7 +134,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -189,7 +196,11 @@ const formsSuccess = async (formType,data) => {
   }
   
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -207,7 +218,7 @@ const handleDelete = async (id: number) => {
     await SubjectAccountApi.deleteSubjectAccount(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -220,7 +231,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SubjectAccountApi.exportSubjectAccount(tableObject.params)
-    download.excel(data, '科目账户配置.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -235,7 +246,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '科目账户配置导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
index aebe21773..ca8cdbc28 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -67,6 +67,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: 'Purchaseprice' })
 
@@ -199,7 +200,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -228,7 +233,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -242,10 +247,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasepriceApi.exportPurchasepriceSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
-      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
@@ -261,7 +266,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.采购价格单导入模版')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index 399553c0a..ad342343c 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -214,7 +214,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -237,7 +237,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
index 410f5ab11..195f31d4f 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/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: 'Supplier' })
 
@@ -152,9 +153,9 @@ const openForm = (type: string, row?: any) => {
       if (item.field == 'code') {
               item.componentProps.disabled = true
             }
-            if (item.field == 'shortName') {
-              item.componentProps.disabled = true
-            }
+            // if (item.field == 'shortName') {
+            //   item.componentProps.disabled = true
+            // }
           })       
   }else {
     Supplier.allSchemas.formSchema.forEach((item) => {
@@ -191,7 +192,11 @@ const formsSuccess = async (formType, data) => {
   }
   basicFormRef.value.formLoading = false
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 /** 详情操作 */
 const detailRef = ref()
@@ -210,7 +215,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -224,10 +229,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await SupplierApi.exportSupplierSCP(tableObject.params)
-      download.excel(data, `${t('ts.供应商')}.xlsx`)
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await SupplierApi.exportSupplier(tableObject.params)
-      download.excel(data, `${t('ts.供应商')}.xlsx`)
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
@@ -243,7 +248,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.供应商导入模版')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index 2508b2d78..b386fcf1a 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -227,6 +227,9 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -241,7 +244,10 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '最后更新时间',
@@ -249,7 +255,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -272,7 +278,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index a439b6bbf..f5a97cd98 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -66,6 +66,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: 'Supplieritem' })
 
@@ -210,7 +211,11 @@ const formsSuccess = async (formType,data) => {
       }
       basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 // 查询页面返回
@@ -243,7 +248,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -257,10 +262,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await SupplieritemApi.exportSupplieritemSCP(tableObject.params)
-      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
-      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
@@ -276,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.供应商物料导入模版')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 5ddace825..200a5484d 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -302,6 +302,9 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -316,7 +319,10 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '最后更新时间',
@@ -324,7 +330,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -347,7 +353,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
index 7d383b84d..6ce4163de 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts
@@ -246,7 +246,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -269,7 +269,7 @@ export const Accountcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
index 10989ddfb..ee11428cb 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/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: 'Accountcalendar' })
 
@@ -177,7 +178,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -197,7 +202,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -210,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
-    download.excel(data, '账期日历.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '账期日历导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
index a0451761d..02366d873 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
@@ -155,7 +155,7 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -178,7 +178,7 @@ export const Currencyexchange = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 4ef2e5be9..83203a9ad 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -66,6 +66,7 @@ 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 { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Currencyexchange' })
 
@@ -178,7 +179,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -198,7 +203,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -211,7 +216,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
-    download.excel(data, '货币转换.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -226,7 +231,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '货币转换导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index aa3d5af8f..841fa0727 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -203,7 +203,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index 9181412d6..5d7a069da 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/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: 'Systemcalendar' })
 
@@ -177,7 +178,11 @@ const formsSuccess = async (formType,data) => {
         basicFormRef.value.formLoading = false
       }
       basicFormRef.value.dialogVisible = false
-      getList()
+      if (formType === 'create') {
+        getList()
+      }else{
+        buttonBaseClick('refresh',null)
+      }
 }
 
 /** 详情操作 */
@@ -197,7 +202,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -210,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
-    download.excel(data, '系统日历.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -225,7 +230,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '系统日历导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
index 4e41b2ff4..c413767db 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts
@@ -179,7 +179,7 @@ export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -202,7 +202,7 @@ export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 5d441845d..a0ac95b07 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -73,6 +73,7 @@ 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 { getTenantId }from '@/utils/auth'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'MesBarCode' })
@@ -136,7 +137,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -182,7 +189,11 @@ const formsSuccess = async (formType,data) => {
   }
 
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -200,7 +211,7 @@ const handleDelete = async (id: number) => {
     await MesBarCodeApi.deleteMesBarCode(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -213,7 +224,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await MesBarCodeApi.exportMesBarCode(tableObject.params)
-    download.excel(data, '生产条码清单.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -228,7 +239,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '生产条码清单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index cb40fc97f..d6590816b 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -15,6 +15,15 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
   {
     label: '状态',
     field: 'status',
@@ -62,15 +71,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true
-  },
+
   {
     label: '阶段',
     field: 'stage',
@@ -515,6 +516,15 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 4590adb4f..b09b17706 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     try {
       await CountJobMainApi.abandonCountJobMain(row.id)
-      await getList()
+      buttonBaseClick('refresh',null)
     } finally {
       tableObject.loading = false
     }
@@ -249,7 +249,7 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     try {
       await CountJobMainApi.acceptCountJobMain(row.id)
-      await getList()
+      buttonBaseClick('refresh',null)
     } finally {
       tableObject.loading = false
     }
@@ -271,7 +271,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await CountJobMainApi.closeCountJobMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
@@ -282,7 +282,7 @@ const handleDone = async (id: number) => {
     await message.confirm('确认完成吗？')
     tableObject.loading = true
     await CountJobMainApi.doneCountJobMain(id)
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 02fc286fc..a658c2a95 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -287,6 +287,15 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:true,
     isForm: 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')]
+      },
+    },
   },
   {
     label: '开始时间',
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 252a39a52..c911417c1 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('打开成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -320,7 +320,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('关闭成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -333,7 +333,7 @@ const buttonTableClick = async (val, row) => {
     await CountPlanMainApi.submit(row.id)
     message.success(t('提交审批成功'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainPlanTur') {
     // 驳回
     await message.confirm('确认要驳回吗？')
@@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('驳回成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('审批已通过'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -370,7 +370,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('发布成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('common.updateSuccess'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -606,7 +606,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
@@ -689,7 +689,11 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 9b654999a..e8649797e 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -249,6 +249,15 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index ab0a9db8b..830bf6e65 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -140,7 +140,7 @@ const buttonTableClick = async (val, row) => {
     CountRecordMainApi.generateCountRecordMain(row.id).then(()=>{
       message.success(t('生成成功'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 9312c798e..4d5aa8a54 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -321,6 +321,15 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index e1de90f2d..cd29c597c 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -183,7 +183,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) =>
       CountRequestMainApi.reCount(row).then((res)=>{
         message.success('重盘成功')
         getLoading?.close()
-        getList()
+        buttonBaseClick('refresh',null)
       }).catch((err) => {
         getLoading?.close()
       })
@@ -198,7 +198,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) =>
       CountRequestMainApi.superviseCount(row).then((res)=>{
         message.success('监盘成功')
         getLoading?.close()
-        getList()
+        buttonBaseClick('refresh',null)
       }).catch((err) => {
         getLoading?.close()
       })
@@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('关闭成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -336,7 +336,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('添加成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -350,7 +350,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('提交审批成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -364,7 +364,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('驳回成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('审批已通过'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -392,7 +392,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('处理成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -429,7 +429,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('已生成盘点调整申请'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -443,7 +443,7 @@ const buttonTableClick = async (val, row) => {
       .then(() => {
         message.success(t('解冻成功'))
         tableObject.loading = false
-        getList()
+        buttonBaseClick('refresh',null)
       })
       .catch((err) => {
         tableObject.loading = false
@@ -486,7 +486,7 @@ const handleDelete = async (id: number) => {
     
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
@@ -545,7 +545,11 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 02181626c..d1f6cd14c 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -202,6 +202,15 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 56b470f13..bcc8c248a 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -308,7 +308,16 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index ee5554732..3d5f41c6f 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -206,7 +206,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.close(row.id).then(() => {
       message.success(t('关闭成功'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -217,7 +217,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.reAdd(row.id).then(() => {
       message.success(t('添加成功'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -228,7 +228,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.submit(row.id).then(() => {
       message.success(t('提交审批成功'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.refused(row.id).then(() => {
       message.success(t('驳回成功'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -250,7 +250,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.agree(row.id).then(() => {
       message.success(t('审批已通过'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => {
     CountadjustRequestMainApi.handle(row.id).then(() => {
       message.success(t('处理成功'))
       getLoading?.close()
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       getLoading?.close()
       console.log(err)
@@ -306,7 +306,7 @@ const handleDelete = async (id: number) => {
     await CountadjustRequestMainApi.deleteCountadjustRequestMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
@@ -365,7 +365,11 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index c89e43e16..a5e8701cb 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -317,6 +317,15 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
+  },
+    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')]
+      },
     },
   },
   {
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index a44cd0964..0b25a3b59 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -366,7 +366,16 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isTable: true,
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index 2cd3757d9..47b5b1aab 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -229,7 +229,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -251,7 +251,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -262,7 +262,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -273,7 +273,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -313,7 +313,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -374,7 +374,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index af95c27c6..53ff33579 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -19,6 +19,16 @@ export const CustomerreturnJobMain = useCrudSchemas(
       },
       isSearch: true
     },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      isSearch: true
+    },
     {
       label: '状态',
       field: 'status',
@@ -31,16 +41,6 @@ export const CustomerreturnJobMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '申请单号',
-      field: 'requestNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isTable: true,
-      isSearch: true
-    },
     {
       label: '发货记录单号',
       field: 'deliverRecordNumber',
@@ -620,7 +620,16 @@ export const CustomerreturnJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
index a8dc7be9c..4a7a883b2 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -305,12 +305,12 @@ const buttonTableClick = async (val, row) => {
     handleHandle(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
     // await message.confirm('确认要放弃吗？')
     // console.log('列表-操作按钮事件-放弃')
     // CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
     //   message.success(t('common.updateSuccess'))
-    //   getList()
+    //   buttonBaseClick('refresh',null)
     // }).catch(err => {
     //   console.log(err)
     // })
@@ -319,18 +319,18 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-关闭')
     CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       console.log(err)
     })
   } else if (val == 'mainJobAcc') { // 承接
     await CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
     // await message.confirm('确认要承接吗？')
     // console.log('列表-操作按钮事件-承接')
     // CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
     //   message.success(t('common.updateSuccess'))
-    //   getList()
+    //   buttonBaseClick('refresh',null)
     // }).catch(err => {
     //   console.log(err)
     // })
@@ -352,7 +352,7 @@ const handleHandle = async (data) => {
     await message.confirm(t('common.confirmHandle'))
     await CustomerreturnJobMainApi.executeCustomerreturnJobMain(data)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 4f55dbf93..72c5ffb1a 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -19,20 +19,6 @@ export const CustomerreturnRecordMain = useCrudSchemas(
       },
       isSearch: true
     },
-    {
-      label: '状态',
-      field: 'status',
-      dictType: DICT_TYPE.REQUEST_STATUS,
-      dictClass: 'string',
-      isSearch: false,
-      isTable: false,
-      isDetail: false,
-      isForm: false,
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
     {
       label: '申请单号',
       field: 'requestNumber',
@@ -50,8 +36,22 @@ export const CustomerreturnRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false
     },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      isDetail: false,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+   
     {
       label: '发货记录单号',
       field: 'deliverRecordNumber',
@@ -391,7 +391,16 @@ export const CustomerreturnRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 341492e4a..bf1e93890 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -621,7 +621,16 @@ export const CustomerreturnRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isForm: false
+      isForm: 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')]
+        },
+      },
     },
     {
       label: '创建者',
@@ -873,47 +882,47 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-      searchCondition: [{
-        key:'customerCode', // 查询列表中字段
-        value:'customerCode', // 指主表某字段
-        message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-        isMainValue: true // 表示查询条件是主表的字段的值
-      }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-        searchCondition: [{
-          key:'customerCode', // 查询列表中字段
-          value:'customerCode', // 指主表某字段
-          message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-          isMainValue: true // 表示查询条件是主表的字段的值
-        }
-      ]
-      }
-    }
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择包装号',
+  //     searchField: 'packingNumber',
+  //     searchTitle: '库存余额信息',
+  //     searchAllSchemas: Balance.allSchemas,
+  //     searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //     searchCondition: [{
+  //       key:'customerCode', // 查询列表中字段
+  //       value:'customerCode', // 指主表某字段
+  //       message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //       isMainValue: true // 表示查询条件是主表的字段的值
+  //     }
+  //   ]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择包装号',
+  //       searchField: 'packingNumber',
+  //       searchTitle: '库存余额信息',
+  //       searchAllSchemas: Balance.allSchemas,
+  //       searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //       searchCondition: [{
+  //         key:'customerCode', // 查询列表中字段
+  //         value:'customerCode', // 指主表某字段
+  //         message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //         isMainValue: true // 表示查询条件是主表的字段的值
+  //       }
+  //     ]
+  //     }
+  //   }
+  // },
   // {
   //   label: '器具号',
   //   field: 'containerNumber',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index a65804247..a6b1b8c67 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -220,6 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             value = obj.fromLocationCode
             obj.fromLocationCode = obj.toLocationCode
             obj.toLocationCode = ''
+            obj.packingNumber = '' // 包装号所有为空
             CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{
               if(item.field == 'packingNumber') {
               item.isInpuFocusShow = false
@@ -319,6 +320,7 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -336,7 +338,8 @@ const butttondata = (row,$index) => {
         {
       label: '生成标签',
       name: 'ssbq',
-      hide: isShowMainButton(row, ['3','6']),
+      // hide: isShowMainButton(row, ['3','6']),
+      hide: isShowMainButton(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',
@@ -358,7 +361,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreturnRequestMainApi.close(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -368,7 +371,7 @@ const buttonTableClick = async (val, row) => {
       CustomerreturnRequestMainApi.reAdd(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -379,7 +382,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreturnRequestMainApi.submit(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -390,7 +393,7 @@ const buttonTableClick = async (val, row) => {
     CustomerreturnRequestMainApi.refused(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -401,18 +404,31 @@ const buttonTableClick = async (val, row) => {
     CustomerreturnRequestMainApi.agree(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
     })
   } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
     CustomerreturnRequestMainApi.handle(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -625,7 +641,7 @@ const handleDelete = async (id: number) => {
     await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -742,7 +758,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 9e6f52b29..cf585acbb 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -583,7 +583,16 @@ export const DeliverJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 83153f2cf..142ca8905 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -313,13 +313,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     await DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await DeliverJobMainApi.closeDeliverJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -337,7 +337,7 @@ const handleHandle = async (data) => {
     await message.confirm(t('common.confirmHandle'))
     await DeliverJobMainApi.executeDeliverJobMain(data)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index a8b74b320..f02abe45b 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -360,7 +360,16 @@ export const DeliverRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index c9f372fc0..a30a1db82 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -590,7 +590,16 @@ export const DeliverRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isForm: false
+      isForm: 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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index eab590c56..59a449b0c 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -357,7 +357,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -368,7 +368,7 @@ const buttonTableClick = async (val, row) => {
     DeliverRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -461,7 +461,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -561,7 +561,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index c1b0b4b1b..4070f3ffd 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -254,6 +254,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 72507bad8..031b80c78 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -318,7 +318,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -329,7 +329,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -340,7 +340,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -351,7 +351,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -373,7 +373,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => {
     DeliverPlanMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -420,7 +420,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -527,7 +527,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
index 04aac908e..7bd7a29e7 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@@ -240,7 +240,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -296,7 +296,11 @@ const submitForm = async (formType, data) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 523ceba6c..f8f69a610 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -205,6 +205,15 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index c6bc737b7..f7f44393f 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -127,7 +127,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -165,7 +171,11 @@ const formsSuccess = async (formType,data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
@@ -183,7 +193,7 @@ const handleDelete = async (id: number) => {
     await SaleShipmentMainRecordApi.deleteSaleShipmentMainRecord(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index c61b8d70e..0394c60c6 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -117,6 +117,7 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index b4f467c92..414ca0951 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -258,7 +258,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -269,7 +269,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -302,7 +302,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => {
     SaleShipmentMainApi.abort(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -385,7 +385,11 @@ const submitForm = async (formType, submitData) => {
     }
     basicFormRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
@@ -430,7 +434,7 @@ const handleDelete = async (id: number) => {
     await SaleShipmentMainApi.deleteSaleShipmentMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index e88fe8756..e2ac37953 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -236,6 +236,7 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index c9e7fb277..67eea24ae 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => {
     handleHandle
   } else if (val == 'mainJobAba') { // 放弃
     await StockupJobMainApi.abandonStockupMainJob(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await StockupJobMainApi.closeStockupMainJob(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await StockupJobMainApi.acceptStockupMainJob(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -226,7 +226,7 @@ const handleHandle = async (data) => {
     await message.confirm(t('common.confirmHandle'))
     await StockupJobMainApi.executeStockupMainJob(data)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
index 4915327f5..359674d44 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@@ -17,8 +17,8 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     isForm: false,
     table: {
@@ -26,14 +26,13 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
     sort: 'custom',
     isForm: false,
     table: {
       width: 180
     },
-    isTable: false
   },
   {
     label: '从仓库',
@@ -416,6 +415,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
     hiddenInMain: true,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
index f18b2f050..4e5ad182a 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@@ -17,34 +17,33 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
-    isForm: false,
+    // isSearch: true,
     table: {
       width: 180
     },
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '任务单号',
+    field: 'jobNumber',
     sort: 'custom',
     // isSearch: true,
     table: {
       width: 180
     },
-    isTable: false,
   },
   {
-    label: '任务单号',
-    field: 'jobNumber',
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
     sort: 'custom',
-    // isSearch: true,
+    isForm: false,
     table: {
       width: 180
     },
-    isTable: false,
   },
+ 
   {
     label: '从仓库',
     field: 'fromWarehouseCode',
@@ -242,7 +241,16 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 874087ca8..382cc0f0f 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -302,7 +302,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => {
     StockupMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -401,7 +401,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -489,7 +489,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 845d74634..a0e70bc4b 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -173,10 +173,10 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index ab31fc260..31e8df4fe 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -1,445 +1,476 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存余额
  */
-export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '器具代码',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable:false
-  // },
-  {
-    label: '库存数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区类型',
-    field: 'areaType',
-    sort: 'custom',
-    dictType: DICT_TYPE.AREA_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 150
-    },
-  },
-  
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: 'ERP库位代码',
-  //   field: 'erpLocationCode',
-  //   dictType: DICT_TYPE.ERP_LOCATION,
-  //   dictClass: 'string',
-  //   isTable: false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  // },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    isTable: true,
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+export const Balance = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '物料类型',
+      field: 'itemType',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      isSearch: true,
+      table: {
+        width: 100
       }
     },
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    isTable: true,
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '包装号',
+      field: 'packingNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '失效日期',
-    field: 'expireDate',
-    isTable: true,
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
       }
     },
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
+    // {
+    //   label: '器具代码',
+    //   field: 'containerNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable:false
+    // },
+    {
+      label: '库存数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
     },
-    isTable: false,
-  },
-  {
-    label: '锁定数量',
-    field: 'lockedQty',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  // {
-  //   label: '可用数量',
-  //   field: 'usableQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  // {
-  //   label: '单价',
-  //   field: 'singlePrice',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  // {
-  //   label: '金额',
-  //   field: 'amount',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  // {
-  //   label: '入库时间',
-  //   field: 'putInTime',
-  //   isTable: true,
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       type: 'datetime',
-  //     }
-  //   }
-  // },
-  {
-    label: '是否冻结',
-    field: 'frozen',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '库位代码',
+      field: 'locationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+    {
+      label: '库区类型',
+      field: 'areaType',
+      sort: 'custom',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: true,
+      table: {
+        width: 150
       }
     },
-  },
-  // {
-  //   label: '冻结原因',
-  //   field: 'frozenReason',
-  //   dictType: DICT_TYPE.FROZEN_REASON,
-  //   dictClass: 'string',
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '重量',
-  //   field: 'weight',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  // {
-  //   label: '面积',
-  //   field: 'area',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  // {
-  //   label: '体积',
-  //   field: 'volume',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     component: 'InputNumber',
-  //   }
-  // },
-  {
-    label: '最后事务号',
-    field: 'lastTransNumber',
-    sort: 'custom',
-    table: {
-      width: 150
+
+    {
+      label: '仓库代码',
+      field: 'warehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '库位组代码',
+      field: 'locationGroupCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '库区代码',
+      field: 'areaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: 'ERP库位代码',
+    //   field: 'erpLocationCode',
+    //   dictType: DICT_TYPE.ERP_LOCATION,
+    //   dictClass: 'string',
+    //   isTable: false,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '替代批次',
+    //   field: 'altBatch',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTable: false,
+    // },
+    {
+      label: '到货日期',
+      field: 'arriveDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
       }
     },
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '生产日期',
+      field: 'produceDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
     },
-    isForm: false
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '失效日期',
+      field: 'expireDate',
+      isTable: true,
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    {
+      label: '货主代码',
+      field: 'ownerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '锁定数量',
+      field: 'lockedQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false,
+      form: {
+        component: 'InputNumber'
+      }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    // {
+    //   label: '可用数量',
+    //   field: 'usableQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '单价',
+    //   field: 'singlePrice',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '金额',
+    //   field: 'amount',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '入库时间',
+    //   field: 'putInTime',
+    //   isTable: true,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //     }
+    //   }
+    // },
+    {
+      label: '是否冻结',
+      field: 'frozen',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     },
-    isForm: false,
-    isTable: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
+    // {
+    //   label: '冻结原因',
+    //   field: 'frozenReason',
+    //   dictType: DICT_TYPE.FROZEN_REASON,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '重量',
+    //   field: 'weight',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '面积',
+    //   field: 'area',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    // {
+    //   label: '体积',
+    //   field: 'volume',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     component: 'InputNumber',
+    //   }
+    // },
+    {
+      label: '最后事务号',
+      field: 'lastTransNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-    isForm: false,
-    isTable: false
-  },
-  // TODO: 临时添加 方便操作
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 200,
-      fixed: 'right'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: 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')]
+        }
+      }
     },
-  }
-]))
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
+    {
+      label: '最后更新时间',
+      field: 'updateTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isForm: false,
+      isTable: false
+    },
+    {
+      label: '最后更新者',
+      field: 'updater',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: false
+    },
+    // TODO: 临时添加 方便操作
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 200,
+        fixed: 'right'
+      }
+    }
+  ])
+)
 
 // 表单校验
 export const BalanceRules = reactive({
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index cb7edfa86..1d0d36a8b 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -285,7 +285,7 @@ const handleDelete = async (id: number) => {
     await BalanceApi.deleteBalance(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
index 2091217e8..8bd5d3662 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
@@ -34,6 +34,15 @@ export const ContainerBindRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: 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')]
+      }
+    },
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
index 087457ae7..10d03fdca 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
@@ -208,7 +208,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -241,7 +241,11 @@ const submitForm = async (formType, data) => {
     }
     basicFormRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
index 4a6b743fc..728ec5821 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
@@ -33,6 +33,7 @@ export const ContainerRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
index 92b1d1884..e1d61fee8 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
@@ -207,7 +207,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -240,7 +240,11 @@ const submitForm = async (formType, data) => {
     }
     basicFormRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
index 25337e1c1..7c1576fca 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
@@ -34,6 +34,15 @@ export const ContainerUnbindRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: 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')]
+      }
+    },
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
index 2cab32a20..ffd5499ac 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
@@ -207,7 +207,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -240,7 +240,11 @@ const submitForm = async (formType, data) => {
     }
     basicFormRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
index c5d9a536b..b3d9edc10 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
@@ -193,7 +193,7 @@ const repairSubmit = async (id: number) => {
     await ContainerMainApi.repairSubmitContainerRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -205,7 +205,7 @@ const scrapSubmit = async (id: number) => {
     await ContainerMainApi.scrapSubmitContainerRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -259,7 +259,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -313,7 +313,11 @@ const formsSuccess = async (formType,data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 初始化 **/
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
index 96c82cf8c..8613ae313 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
@@ -28,7 +28,7 @@ export const ContainerInitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
index 755a0d8eb..75b5554f1 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
@@ -205,7 +205,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -238,7 +238,11 @@ const submitForm = async (formType, data) => {
     }
     basicFormRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     basicFormRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts
index 94ed80b46..5c8d1f4ac 100644
--- a/src/views/wms/inventoryManage/expectin/expectin.data.ts
+++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts
@@ -118,7 +118,16 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
index 98e4ec8bd..79d3229be 100644
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-  getList()
+    buttonBaseClick('refresh',null)
   } catch {} 
 }
 
@@ -213,7 +213,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts
index 2f06595b5..4d9447e77 100644
--- a/src/views/wms/inventoryManage/expectout/expectout.data.ts
+++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts
@@ -126,7 +126,16 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -169,7 +178,7 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isTable: false
-  },
+  }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
index 973c12b43..b433d8ae1 100644
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-  getList()
+    buttonBaseClick('refresh',null)
   } catch {} 
 }
 // 列表-操作按钮
@@ -212,7 +212,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue
index 481e6799d..39d37e344 100644
--- a/src/views/wms/inventoryManage/locationcapacity/index.vue
+++ b/src/views/wms/inventoryManage/locationcapacity/index.vue
@@ -167,7 +167,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
index b0e43194f..aa3b9eb83 100644
--- a/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
+++ b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
@@ -1,4 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库位容量
@@ -49,6 +50,29 @@ export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    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')]
+      }
+    },
+  },
 ]))
 
 // 表单校验
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 2ed0e267b..58aa92a26 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -39,9 +39,11 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
+  <!-- isCheckStrictly：true 取消父子关联 -->
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
+    :isCheckStrictly="true" 
     :rules="PackageRules"
     :formAllSchemas="Package.allSchemas"
     :searchTableParams="searchTableParams"
@@ -65,6 +67,7 @@ import { Package,PackageRules } from './package.data'
 import * as PackageApi from '@/api/wms/package'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain";
 
 defineOptions({ name: 'package' })
 
@@ -85,15 +88,28 @@ const updataTableColumns = (val) => {
 // 查询列表页面参数设置
 const searchTableParams = ref([
 ])
-
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode'){
       setV['itemName'] = val[0]['name']
-      basicFormRef.setValues(setV)
-      basicFormRef.setValues(setV)
+      setV['itemDesc1'] = val[0]['desc1']
+      setV['itemDesc2'] = val[0]['desc2']
+      setV['uom'] = val[0]['uom']
+      setV['altUom'] = val[0]['altUom']
+    }
+    else if (formField == 'packUnit'){
+      setV['packQty'] = val[0]['packQty']
+    }
+    else if(formField == 'toWarehouseCode'){
+      setV['toLocationCode'] = null
+    }
+    else if(formField == 'supplierCode'){
+      setV['supplierItemCode'] = val[0]['supplierItemCode']
+    }
+    formRef.setValues(setV)
   })
 }
 
@@ -221,7 +237,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -245,7 +261,12 @@ const BASE_URL = getJmreportBaseUrl()
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  if(!data.productionLineCode&&!data.supplierCode){
+    message.error(t('供应商代码 和 生产线代码至少填一个！'))
+    return
+  }
   basicFormRef.value.formLoading = true
+  
   try {
     if (formType === 'create') {
       await PackageApi.createPackage(data)
@@ -260,7 +281,11 @@ const formsSuccess = async (formType,data) => {
     basicFormRef.value.formLoading = false
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 // 标签打印
 // const handlePoint = async (row) => {
@@ -311,7 +336,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xlsx'
+  templateTitle: '包装信息导入模板.xlsx'
 })
 
 // 导入成功之后
@@ -331,5 +356,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await PackageApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index cd0625bf5..a8d1f6955 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -2,12 +2,36 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+import {Dock} from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data";
+import * as DockApi from "@/api/wms/dock";
+import {Packageunit} from "@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data";
+import * as PackageunitApi from "@/api/wms/packageunit";
+import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from "@/api/wms/location";
+import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
+import * as SupplierApi from "@/api/wms/supplier";
+import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
+import * as ItempackagingApi from "@/api/wms/itempackage";
+import * as SupplieritemApi from "@/api/wms/supplieritem";
+import { formatTime } from '@/utils/index'
+
+import {
+  Supplieritem
+} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
+import {
+  Productionline
+} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data";
+import * as ProductionlineApi from "@/api/wms/productionline";
 
 // 表单校验
 export const PackageRules = reactive({
-  number: [required],
+  // number: [required],
   itemCode: [required],
   itemName: [required],
+  packUnit: [required],
+  packQty: [required],
 })
 export const Package = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -19,12 +43,14 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    isForm:false
   },
   {
     label: '父包装号',
     field: 'parentNumber',
     sort: 'custom',
     isSearch: true,
+    isForm: false,
     table: {
       width: 180,
     },
@@ -50,7 +76,15 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     isSearch: true
@@ -70,6 +104,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
   },
   {
     label: '物料描述2',
@@ -78,12 +117,20 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
     isSearch: true,
+    form:{
+      value:  formatTime(new Date(), 'yyyyMMdd')
+    },
     table: {
       width: 150,
     },
@@ -123,6 +170,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'DatePicker',
+      value:  formatTime(new Date(), 'yyyy-MM-dd'),
       componentProps: {
         style: {width: '100%'},
         type: 'date',
@@ -186,7 +234,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     form: {
-      component: 'SelectV2'
+      component: 'SelectV2',
+      componentProps: {
+        disabled: true
+      }
     },
     table: {
       width: 150,
@@ -207,7 +258,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     form: {
-      component: 'SelectV2'
+      component: 'SelectV2',
+      componentProps: {
+        disabled: true
+      }
     },
     table: {
       width: 150,
@@ -229,14 +283,6 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -249,31 +295,134 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch:true,
+        isSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'packUnit',
+        searchTitle: '物料包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItempackagingApi.getItempackagingPageTree,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key:'itemCode', // 查询列表中字段
+          value:'itemCode', // 指主表某字段
+          message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true, // 表示查询条件是主表的字段的值
+          action: '==', // 查询拼接条件
+        }],
+        verificationParams: [{
+          key: 'packUnit',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+
+      }
+    }
   },
   {
-    label: '仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '月台代码',
-    field: 'toDockCode',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150,
     },
-  },
-  {
-    label: '库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150,
+    form: {
+      componentProps: {
+        disabled: true
+      }
     },
   },
+  // {
+  //   label: '仓库代码',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       enterSearch:true,
+  //       isSearch:true,
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '月台代码',
+  //   field: 'toDockCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       enterSearch: true,
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择月台代码',
+  //       searchField: 'code',
+  //       searchTitle: '客户月台',
+  //       searchAllSchemas: Dock.allSchemas,
+  //       searchPage: DockApi.getDockPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }],
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       enterSearch: true,
+  //       isSearchList: true,
+  //       searchListPlaceholder: '请选择库位代码',
+  //       searchField: 'code',
+  //       searchTitle: '库位信息',
+  //       searchAllSchemas: Location.allSchemas,
+  //       searchPage: LocationApi.getLocationPage,
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       },{
+  //         key: 'warehouseCode',
+  //         value: 'toWarehouseCode',
+  //         message: '请填写仓库代码！',
+  //         isMainValue: true
+  //       }],
+  //     }
+  //   }
+  // },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -281,6 +430,36 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch:true,
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'supplierCode', // 查询弹窗赋值字段
+        searchTitle: '供应商物料信息',
+        isSearchList: true, // 开启查询弹窗
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition:[{
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        }],
+        verificationParams: [
+          {
+            key: 'supplierCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
+
+      }
+    }
   },
   {
     label: '供应商物料代码',
@@ -289,55 +468,106 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      componentProps: {
+        disabled: true
+        // enterSearch: true,
+        // isSearchList: true, // 开启查询弹窗
+        // searchListPlaceholder: '请选择供应商物料', // 输入框占位文本
+        // searchField: 'supplierItemCode', // 查询弹窗赋值字段
+        // searchTitle: '供应商信息', // 查询弹窗标题
+        // searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        // searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        // searchCondition: [
+        //   {
+        //     key: 'available',
+        //     value: 'TRUE',
+        //     isMainValue: false
+        //   },{
+        //     key: 'supplierCode',
+        //     value: 'supplierCode',
+        //     message: '请填写物料代码！',
+        //     isMainValue: true
+        //   }
+        // ],
+        // verificationParams: [
+        //   {
+        //     key: 'code',
+        //     action: '==',
+        //     value: '',
+        //     isMainValue: false,
+        //     isSearch: true,
+        //     isFormModel: true
+        //   }
+        // ] // 失去焦点校验参数
+      }
+    }
   },
   {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '采购订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '采购计划单号',
-    field: 'rpNumber',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '发货单号',
-    field: 'asnNumber',
-    sort: 'custom',
-    table: {
-      width: 182,
-    },
-  },
-  {
-    label: '生产订单号',
-    field: 'woNumber',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '生产订单行',
-    field: 'woLine',
+    label: '标签数量',
+    field: 'count',
     sort: 'custom',
+    isTable: false,
     table: {
-      width: 150,
+      width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0,
+        max: 100,
+      }
+    }
   },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '采购订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '采购计划单号',
+  //   field: 'rpNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '发货单号',
+  //   field: 'asnNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 182,
+  //   },
+  // },
+  // {
+  //   label: '生产订单号',
+  //   field: 'woNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '生产订单行',
+  //   field: 'woLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
   {
     label: '生产线代码',
     field: 'productionLineCode',
@@ -345,103 +575,120 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        multiple:true,
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
   },
-  {
-    label: '班组代码',
-    field: 'teamCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '班次代码',
-    field: 'shiftCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '客户代码',
-    field: 'customerCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '客户月台代码',
-    field: 'customerDockCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '客户物料代码',
-    field: 'customerItemCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '销售订单号',
-    field: 'soNumber',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '销售订单行',
-    field: 'soLine',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '质量等级',
-    field: 'eqLevel',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '重量',
-    field: 'weight',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '面积',
-    field: 'area',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
-  {
-    label: '体积',
-    field: 'volume',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
+  // {
+  //   label: '班组代码',
+  //   field: 'teamCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '班次代码',
+  //   field: 'shiftCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '客户代码',
+  //   field: 'customerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '客户月台代码',
+  //   field: 'customerDockCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '客户物料代码',
+  //   field: 'customerItemCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '质量等级',
+  //   field: 'eqLevel',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '货主代码',
+  //   field: 'ownerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '重量',
+  //   field: 'weight',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '面积',
+  //   field: 'area',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
+  // {
+  //   label: '体积',
+  //   field: 'volume',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -461,7 +708,16 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index 23f4cd17e..12b5ed0ad 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -168,7 +168,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index 18bd46297..961e6bf1d 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -286,6 +286,37 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    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')]
+      }
+    },
+  },
 
 
 
diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue
index 1303b5ef2..a59a5d54b 100644
--- a/src/views/wms/inventoryManage/transferlog/index.vue
+++ b/src/views/wms/inventoryManage/transferlog/index.vue
@@ -167,7 +167,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
index 68eef843b..26b8967e4 100644
--- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
+++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
@@ -375,7 +375,16 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index 9afba26c7..c023ed086 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -215,6 +215,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index bc48196fa..5964396b7 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -306,7 +306,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -348,7 +354,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -359,7 +365,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -370,7 +376,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -381,7 +387,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -392,7 +398,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -403,7 +409,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -477,7 +483,11 @@ const submitForm = async (formType,submitData) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 } finally {
   basicFormRef.value.formLoading = false
   }
@@ -498,7 +508,7 @@ const handleDelete = async (id: number) => {
     await ContainerMainRequestApi.deleteContainerMainRequest(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
index e63799675..57daad0dd 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@@ -126,6 +126,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index f4dba5289..6c8da9a16 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -162,7 +162,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -215,7 +221,7 @@ const handleDelete = async (id: number) => {
     await ContainerRecordMainApi.deleteContainerRecordMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 96b9229c3..2e5458fae 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -268,7 +268,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -301,7 +307,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -312,7 +318,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -432,7 +438,11 @@ const submitForm = async (formType,submitData) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 } finally {
   basicFormRef.value.formLoading = false
   }
@@ -453,7 +463,7 @@ const handleDelete = async (id: number) => {
     await ContainerMainRequestApi.deleteContainerMainRequest(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index 233ae6d55..119add89e 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -219,6 +219,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -227,7 +228,10 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable:false,
+    isTable: true,
+    table: {
+      width: 180
+    },
     isForm: false,
   },
   {
@@ -485,7 +489,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable:false,
+    isTable: false,
+    table: {
+      width: 180
+    },
     isForm: false,
     isTableForm: false
   },
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 08285130b..5239b74b9 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -290,7 +290,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -367,7 +373,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -378,7 +384,7 @@ const buttonTableClick = async (val, row) => {
     ContainerMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -457,7 +463,11 @@ const submitForm = async (formType,submitData) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 } finally {
   basicFormRef.value.formLoading = false
   }
@@ -478,7 +488,7 @@ const handleDelete = async (id: number) => {
     await ContainerMainRequestApi.deleteContainerMainRequest(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 58338a454..7a8b22d41 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -218,6 +218,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat : 'YYYY-MM-DD HH:mm:ss'
     },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
index 76ff3786d..e7b0496ef 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
@@ -196,7 +196,16 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }
-    }
+    },
+    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')]
+      }
+    },
   },
 
   {
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 6d9ca8f17..90793b7ac 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -297,7 +297,7 @@ const handleClose = async (id: number) => {
     await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id)
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -310,7 +310,7 @@ const handleReAdd = async (id: number) => {
     await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id)
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -323,7 +323,7 @@ const handleSubmit = async (id: number) => {
     await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id)
     message.success(t('common.updateSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -336,7 +336,7 @@ const handleAgree = async (id: number) => {
     await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -348,7 +348,7 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
   tableObject.loading = false
 }
@@ -362,7 +362,7 @@ const handleRefused = async (id: number) => {
     await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -392,7 +392,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 //     await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id)
 //     message.success(t('common.delSuccess'))
 //     // 刷新列表
-//     await getList()
+//     buttonBaseClick('refresh',null)
 //   } catch {}
 // }
 
@@ -453,7 +453,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index d90dd8f79..12f41d622 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -296,6 +296,15 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isTable: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index b655b60a6..2e4e8f15a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -194,7 +194,17 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      },
+    },
+
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index fd8dd5624..36bd2f4af 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -132,7 +132,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -167,17 +173,17 @@ const buttonTableClick = async (val, row) => {
     await message.confirm('确认要关闭吗？')
     await PackageoverJobMainApi.closePackageoverJobMain(row.masterId)
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   }else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     await PackageoverJobMainApi.acceptPackageoverJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAba') { // 放弃
     await PackageoverJobMainApi.abandonPackageoverJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 
@@ -208,7 +214,11 @@ const formsSuccess = async (formType,data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -229,7 +239,7 @@ const handleDelete = async (id: number) => {
     await PackageoverJobMainApi.deletePackageoverJobMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
index 015b3e622..ac2a6c853 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@@ -500,7 +500,16 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable: false
+    isTable: 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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
index 97aa03bf5..ce27beb2c 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@@ -11,11 +11,18 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  // },
   {
     label: '任务单据号',
     field: 'jobNumber',
     sort: 'custom',
-    isTable: false,
     isSearch: true,
     table: {
       width: 180
@@ -481,6 +488,36 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    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')]
+      }
+    },
+  },
   // {
   //   label: '创建时间',
   //   field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 1ac4e1452..7edb981c1 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -257,7 +257,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -268,7 +268,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -279,7 +279,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -290,7 +290,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => {
     PackageoverRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -354,7 +354,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -419,7 +419,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
index 1c2b1683b..04436a526 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@@ -367,6 +367,15 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
index 22242c0af..47d56c66a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@@ -126,7 +126,13 @@ const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
index b1f96b27c..425317c2c 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@@ -15,6 +15,14 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  // },
   {
     label: '任务单据号',
     field: 'jobNumber',
@@ -378,6 +386,15 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 3eb010c76..b853e5c9a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -195,7 +195,16 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index f7ddbe650..676beaacc 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await ScrapJobMainApi.abandonScrapJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     await ScrapJobMainApi.closeScrapJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await ScrapJobMainApi.acceptScrapJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 7afec161a..8f3ef3edd 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -20,6 +20,15 @@ export const ScrapJobMain = useCrudSchemas(
       },
       isSearch: true
     },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
     {
       label: '状态',
       field: 'status',
@@ -32,15 +41,6 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '申请单号',
-      field: 'requestNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isSearch: true
-    },
     {
       label: 'Q3通知单号',
       field: 'q3Number',
@@ -503,7 +503,16 @@ export const ScrapJobMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isTable: false
+      isTable: 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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index b2901d1a2..20a8009e4 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -261,7 +261,16 @@ export const ScrapRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 814dab997..20177ff95 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -291,7 +291,7 @@ const handleClose = async (id: number) => {
     await ScrapRequestMainApi.closeScrapRequestMain(id)
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -303,7 +303,7 @@ const handleReAdd = async (id: number) => {
     await ScrapRequestMainApi.reAddScrapRequestMain(id)
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -315,7 +315,7 @@ const handleSubmit = async (id: number) => {
     await ScrapRequestMainApi.submitScrapRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -327,7 +327,7 @@ const handleRefused = async (id: number) => {
     await ScrapRequestMainApi.refusedScrapRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -339,7 +339,7 @@ const handleAgree = async (id: number) => {
     await ScrapRequestMainApi.agreeScrapRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -351,7 +351,7 @@ const handleHandle = async (id: number) => {
     await ScrapRequestMainApi.handleScrapRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -383,7 +383,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -461,7 +461,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 8225d5bca..8938c82a8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -394,7 +394,16 @@ export const ScrapRequestMain = useCrudSchemas(
         }
       },
       isTable: false,
-      isForm: false
+      isForm: 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')]
+        }
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index 714ac4696..eb90f3cc6 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
index 26391492a..c4b8f6f2d 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@@ -389,6 +389,15 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index e79185505..79008aa80 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -470,6 +470,16 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
+
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
index b20c7da71..c0eea73f2 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@@ -513,6 +513,15 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
index ac8bba927..386c0bc16 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -277,6 +277,15 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 94a4791be..ab17ffa86 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -503,6 +503,15 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false,
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index 2b43fe237..61664b19e 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -513,6 +513,15 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index 466eb63dd..449334325 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -285,6 +285,15 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 00b624e74..246d16e93 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -337,6 +337,15 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
index 19d7c0bb8..e53943ae3 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
@@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 689b8a90a..5482ed0b7 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -25,6 +25,15 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
   {
     label: '状态',
     field: 'status',
@@ -55,15 +64,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-  },
+ 
   {
     label: '申请时间',
     field: 'requestTime',
@@ -368,12 +369,12 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'remarkMain',
     sort: 'custom',
     isTable:false,
     table: {
       width: 150
-    },
+    }
   },
   {
     label: '自动完成',
@@ -645,6 +646,15 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index a24d5b002..52f8636d2 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -375,11 +375,12 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'remarkMain',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -400,6 +401,15 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -736,8 +746,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
-    hiddenInMain:true,
+    isTable: true,
   },
   // {
   //   label: '任务明细ID',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index aa62f4d82..31581700c 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -291,40 +291,56 @@ const buttonTableClick = async (val, row) => {
 const handleHandle = async (id: number) => {
   await message.confirm(t('common.confirmHandle'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id)
-  message.success(t('common.handleSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 审批通过按钮操作 */
 const handleAgree = async (id: number) => {
   await message.confirm(t('common.confirmAgree'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id)
-  message.success(t('common.agreeSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 审批驳回按钮操作 */
 const handleRefused = async (id: number) => {
   await message.confirm(t('common.confirmRefused'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id)
-  message.success(t('common.refusedSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 提交按钮操作 */
 const handleSubmit = async (id: number) => {
   await message.confirm(t('common.confirmSubmit'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id)
-  message.success(t('common.submitSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 
@@ -332,20 +348,28 @@ const handleSubmit = async (id: number) => {
 const handleClose = async (id: number) => {
   await message.confirm(t('common.confirmColse'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id)
-  message.success(t('common.closeSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 重新添加按钮操作 */
 const handleReAdd = async (id: number) => {
   await message.confirm(t('common.confirmReAdd'))
   tableObject.loading = true
-  await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id)
-  message.success(t('common.reAddSuccess'))
-  tableObject.loading = false
-  await getList()
+  try{
+    await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 添加/修改操作 */
@@ -401,7 +425,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -481,7 +505,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index ba2f86dbd..225dec49e 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -497,13 +497,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'remarkMain',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
     sortTableDefault: 1000,
-    isTable: true,
   },
   {
     label: '直接生成记录',
@@ -547,6 +547,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable:false,
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -996,14 +1005,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isTable:false,
   },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index 173434adf..34ba89d23 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await UnplannedreceiptJobMainApi.abandonUnplannedreceiptJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     await UnplannedreceiptJobMainApi.closeUnplannedreceiptJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await UnplannedreceiptJobMainApi.acceptUnplannedreceiptJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 5d1ea6aef..d6f590e93 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -27,6 +27,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
   {
     label: '状态',
     field: 'status',
@@ -39,15 +48,6 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-  },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -350,14 +350,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '备注',
+    field: 'remarkMain',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
   {
     label: '自动完成',
     field: 'autoComplete',
@@ -643,6 +644,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index a9f5d795b..32c7b00bf 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -350,12 +350,12 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'remarkMain',
     isTable:false,
     sort: 'custom',
     table: {
       width: 150
-    },
+    }
   },
   {
     label: '创建时间',
@@ -377,6 +377,15 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index a77e37b73..596f9eaa7 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -513,7 +513,7 @@ const handleClose = async (id: number) => {
     await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{
     tableObject.loading = false
   }
@@ -527,7 +527,7 @@ const handleReAdd = async (id: number) => {
     await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{
     tableObject.loading = false
   }
@@ -541,7 +541,7 @@ const handleSubmit = async (id: number) => {
     await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{
     tableObject.loading = false
   }
@@ -555,7 +555,7 @@ const handleRefused = async (id: number) => {
     await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{
     tableObject.loading = false
   }
@@ -569,7 +569,7 @@ const handleAgree = async (id: number) => {
     await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{
     tableObject.loading = false
   }
@@ -582,7 +582,7 @@ const handleHandle = async (id: number) => {
   try {
     await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } finally {
     tableObject.loading = false
   }
@@ -654,7 +654,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -741,7 +741,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 4b2310c5d..cd7947c15 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -539,11 +539,12 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '备注',
-    field: 'remark',
+    field: 'remarkMain',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1000,
   },
   {
@@ -567,7 +568,16 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -1237,7 +1247,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '创建时间',
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index a0fc82fce..3236df4a8 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -74,6 +74,7 @@ import * as IssueJobDetailApi from '@/api/wms/issueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getDictLabel, DICT_TYPE } from '@/utils/dict'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 发料任务主
 defineOptions({ name: 'IssueJobMain' })
 
@@ -269,16 +270,16 @@ const buttonTableClick = async (val, row) => {
       }]
     }
     await IssueJobMainApi.executeIssueMain(aaa)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAba') { // 放弃
     await IssueJobMainApi.abandonIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await IssueJobMainApi.closeIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await IssueJobMainApi.acceptIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -300,7 +301,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params)
-    download.excel(data, '发料任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 5f14338ab..4ca560e46 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -24,7 +24,7 @@ export const IssueJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false
+      sortTableDefault: 1
     },
     {
       label: '供应商代码',
@@ -331,7 +331,7 @@ export const IssueJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false,
+      isTable: true,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -339,7 +339,16 @@ export const IssueJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '创建者',
@@ -774,6 +783,26 @@ export const IssueJobDetail = useCrudSchemas(
       },
       isSearch: true
     },
+    {
+      label: '从库区',
+      field: 'fromAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      isTable: true
+    },
+    {
+      label: '到库区',
+      field: 'toAreaCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true,
+      isTable: true
+    },
     {
       label: '单据号',
       field: 'number',
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 61c8326cd..1d33dadca 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as IssueRecordMainApi from '@/api/wms/issueRecordMain'
 import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 发料记录主
 defineOptions({ name: 'IssueRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueRecordMainApi.exportIssueRecordMain(tableObject.params)
-    download.excel(data, '发料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index f10bde9f7..718af8ea1 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -18,34 +18,34 @@ export const IssueRecordMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '状态',
-      field: 'status',
-      dictType: DICT_TYPE.JOB_STATUS,
-      dictClass: 'string',
-      isTable: false,
+      label: '申请单号',
+      field: 'requestNumber',
       sort: 'custom',
       table: {
-        width: 150
+        width: 180
       },
       sortTableDefault: 1
     },
     {
-      label: '申请单号',
-      field: 'requestNumber',
+      label: '任务单号',
+      field: 'jobNumber',
       sort: 'custom',
       table: {
         width: 180
       },
-      isTable: false
+      sortTableDefault: 1
     },
     {
-      label: '任务单号',
-      field: 'jobNumber',
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.JOB_STATUS,
+      dictClass: 'string',
+      isTable: false,
       sort: 'custom',
       table: {
-        width: 180
+        width: 150
       },
-      isTable: false
+      sortTableDefault: 1
     },
     {
       label: '供应商代码',
@@ -683,7 +683,16 @@ export const IssueRecordDetail = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '到库位组代码',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 43b0edb6f..cc0172aea 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -103,6 +103,7 @@ import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
 import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as WorkstationApi from '@/api/wms/workstation'
+import { formatDate } from '@/utils/formatTime'
 
 // 发料申请
 defineOptions({ name: 'IssueRequestMain' })
@@ -317,7 +318,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -328,7 +329,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -339,7 +340,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -350,7 +351,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -361,7 +362,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -372,7 +373,7 @@ const buttonTableClick = async (val, row) => {
     IssueRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -430,7 +431,7 @@ const handleDelete = async (id: number) => {
     tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -443,7 +444,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params)
-    download.excel(data, '发料申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -519,7 +520,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -541,7 +546,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '发料申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 247798559..1904b7842 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -577,7 +577,16 @@ export const IssueRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isForm: false
+      isForm: 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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index b4f8a8d89..6a4851095 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -67,6 +67,7 @@ import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecord
 import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 上线结算记录主
 defineOptions({ name: 'OnlinesettlementRecordMain' })
 
@@ -151,7 +152,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(tableObject.params)
-    download.excel(data, '上线结算记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
index e661b8317..80e614380 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
@@ -200,6 +200,15 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index ff16d1679..3ed7419cb 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -86,6 +86,7 @@ import * as OnlinesettlementRequestMainApi from '@/api/wms/onlinesettlementReque
 import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { formatDate } from '@/utils/formatTime'
 
 // 上线结算申请
 defineOptions({ name: 'OnlinesettlementRequestMain' })
@@ -267,7 +268,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(tableObject.params)
-    download.excel(data, '上线结算申请主.xlsx')
+     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -325,7 +326,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上线结算申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 8ea4298e2..cbe5bb6f4 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -88,6 +88,7 @@ import * as PreparetoissueMainApi from '@/api/wms/preparetoissueMain'
 import * as PreparetoissueDetailApi from '@/api/wms/preparetoissueDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { formatDate } from '@/utils/formatTime'
 
 // 备料计划
 defineOptions({ name: 'PreparetoissueMain' })
@@ -458,7 +459,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PreparetoissueMainApi.exportPreparetoissueMain(tableObject.params)
-    download.excel(data, '备料计划主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -532,7 +533,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '备料计划主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index a709b6926..a060bade1 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -423,6 +423,15 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index 611dd428c..c215034cd 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain
 import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产收料任务主
 defineOptions({ name: 'ProductionreceiptJobMain' })
 
@@ -272,13 +273,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreceiptJobMainApi.executeIssueMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -300,7 +301,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(tableObject.params)
-    download.excel(data, '生产收料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index ca98bc89e..4eaf12322 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -23,7 +23,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 2,
   },
   {
     label: '车间代码',
@@ -315,6 +315,15 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index 23ce2913b..7a21ef6bb 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptReco
 import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产收料记录主
 defineOptions({ name: 'ProductionreceiptRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(tableObject.params)
-    download.excel(data, '生产收料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 2ff6a2c2f..15e2231be 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -17,16 +17,13 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: false,
+    label: '生产收料任务单号',
+    field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    sortTableDefault:1,
+    sortTableDefault: 1,
   },
   {
     label: '发料记录单号',
@@ -35,7 +32,19 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    sortTableDefault: 1
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
     isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
   },
   {
     label: '任务单号',
@@ -216,6 +225,15 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 2d64cb732..76b2ea5a7 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -73,6 +73,7 @@ import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain'
 import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产退料任务主
 defineOptions({ name: 'ProductionreturnJobMain' })
 
@@ -244,13 +245,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -272,7 +273,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
-    download.excel(data, '生产退料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index f83b7e195..3cc29ed56 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -15,6 +15,15 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
   {
     label: '状态',
     field: 'status',
@@ -35,16 +44,6 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-    isTable: false,
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -317,6 +316,15 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index ae8aebbeb..17197ae23 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -68,7 +68,8 @@ import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecord
 import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-// 生产退料记录主
+import { formatDate } from '@/utils/formatTime'
+// 生产退料记录主 and 隔离退料记录
 defineOptions({ name: 'ProductionreturnRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -77,6 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
+
 const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
@@ -85,7 +87,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口
+  getListApi: 'ProductionreturnRecordMain'==routeName.value?ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageStore:ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPageHold // 分页接口
 })
 
 // 获得表格的各种操作
@@ -156,7 +158,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
-    download.excel(data, '生产退料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index 3092425ed..9ccd2f3ac 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -15,26 +15,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isSearch: true
   },
-  // {
-  //   label: '状态',
-  //   field: 'status',
-  //   dictType: DICT_TYPE.REQUEST_STATUS,
-  //   dictClass: 'string',
-  //   isForm: false,
-  //   isTable: true,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -42,7 +22,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: false,
     isSearch: true
   },
 
@@ -53,10 +32,30 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isTable: false,
     isSearch: true
   },
 
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   dictType: DICT_TYPE.REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+ 
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -227,6 +226,15 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 62d1cd711..bcc489c2e 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 生产退料申请
 defineOptions({ name: 'ProductionreturnRequestMain' })
@@ -363,7 +364,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -374,7 +375,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -385,7 +386,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -396,7 +397,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -407,7 +408,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -500,7 +501,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -594,7 +595,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -607,7 +608,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(tableObject.params)
-    download.excel(data, '生产退料合格申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -677,7 +678,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -765,7 +770,7 @@ const labelPrint = async (row) => {
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '生产退料导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 0c9f20e76..97ccff14f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -233,7 +233,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {
@@ -430,7 +430,16 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
@@ -655,7 +664,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'businessType',
-        value: 'ReturnToHold', // 隔离退料
+        value: 'ReturnToStore', // 生产退料
         isMainValue: false
       },
       {
@@ -677,7 +686,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'businessType',
-          value: 'ReturnToHold', // 隔离退料
+          value: 'ReturnToStore', // 生产退料
           isMainValue: false
         },
         {
@@ -1018,7 +1027,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 120
     },
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 2ad072261..cf54e1ceb 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -112,6 +112,7 @@ import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 隔离退料申请
 defineOptions({ name: 'ProductionreturnRequestMainNo' })
@@ -344,7 +345,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainNoApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -355,7 +356,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainNoApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -366,7 +367,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainNoApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -377,7 +378,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainNoApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -388,7 +389,7 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnRequestMainNoApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -465,23 +466,23 @@ const buttonTableClick = async (val, row) => {
 
   } else if (val == 'mainHandle') { // 处理
     // 判断 是否已创建标签
-    let isCreateLabel = false
-    await PackageApi.getPackagePage({
-      requestNumber: row.number
-    }).then(res => {
-      if (res) {
-        if (res.list.length > 0) isCreateLabel = true
-      }
-    })
-    if (!isCreateLabel) {
-      message.warning('请先创建标签')
-      return
-    }
+    // let isCreateLabel = false
+    // await PackageApi.getPackagePage({
+    //   requestNumber: row.number
+    // }).then(res => {
+    //   if (res) {
+    //     if (res.list.length > 0) isCreateLabel = true
+    //   }
+    // })
+    // if (!isCreateLabel) {
+    //   message.warning('请先创建标签')
+    //   return
+    // }
     tableObject.loading = true
     ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -538,7 +539,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -551,7 +552,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(tableObject.params)
-    download.excel(data, '生产退料不合格申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -607,7 +608,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -753,7 +758,7 @@ const importFormRef = ref()
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '隔离退料导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 753a35d25..40ace6f98 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -514,17 +514,27 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       },
       isTableForm: false,
       isForm: false,
-      isTable: true
+      isTable: true,
+      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')]
+        },
+      },
     },
     {
       label: '包装规格',
       field: 'packUnit',
       sort: 'custom',
-      isSearch: true,
+      isSearch: false,
       table: {
         width: 120
       },
-      isTable: false,
+      isTable:false,
+      isTableForm:true,
       tableForm: {
         isInpuFocusShow: true,
         isSearchList: true, // 开启查询弹窗
@@ -580,6 +590,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         width: 120
       },
       isTable: false,
+      isTableForm: true,
       tableForm: {
         disabled: true
       },
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
index 9b20b5985..a86d7465d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as ProductionscrapRecordMainApi from '@/api/wms/productionscrapRecordMa
 import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 生产退料记录主
 defineOptions({ name: 'ProductionscrapRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
-    download.excel(data, '线边报废记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index e95a4ca67..3e5b910f5 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -673,6 +673,15 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '接口类型',
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 3f8cae170..706cfc44d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -110,6 +110,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 线标原料报废申请
 defineOptions({ name: 'ProductionscrapRequestMain' })
@@ -363,7 +364,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -374,7 +375,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -385,7 +386,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -396,7 +397,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -407,7 +408,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -500,7 +501,7 @@ const buttonTableClick = async (val, row) => {
     ProductionscrapRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -594,7 +595,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -607,7 +608,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(tableObject.params)
-    download.excel(data, '线边原料报废申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -676,7 +677,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -764,7 +769,7 @@ const labelPrint = async (row) => {
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '线边原料报废导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 5acd62749..c86473107 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -488,7 +488,16 @@ export const ProductionscrapRequestMain = useCrudSchemas(
         }
       },
       isTable: false,
-      isForm: false
+      isForm: 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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index d780368bc..b2ced7cb5 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -73,6 +73,7 @@ import { RepleinshJobMain,RepleinshJobMainRules,RepleinshJobDetail,RepleinshJobD
 import * as RepleinshJobMainApi from '@/api/wms/repleinshJobMain'
 import * as RepleinshJobDetailApi from '@/api/wms/repleinshJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料任务主
 defineOptions({ name: 'RepleinshJobMain' })
@@ -303,13 +304,13 @@ const buttonTableClick = async (val, row) => {
     RepleinshJobMainApi.executeRepleinshMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await RepleinshJobMainApi.closeRepleinshMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 
@@ -328,7 +329,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshJobMainApi.exportRepleinshJobMain(tableObject.params)
-    download.excel(data, '补料任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 2506e3e2d..6051b154e 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -23,7 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
   },
   {
     label: '供应商代码',
@@ -555,6 +555,15 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
index 5f1e898c8..3cd277407 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@@ -67,6 +67,7 @@ import { RepleinshRecordMain,RepleinshRecordMainRules,RepleinshRecordDetail,Repl
 import * as RepleinshRecordMainApi from '@/api/wms/repleinshRecordMain'
 import * as RepleinshRecordDetailApi from '@/api/wms/repleinshRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料记录主
 defineOptions({ name: 'RepleinshRecordMain' })
@@ -153,7 +154,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(tableObject.params)
-    download.excel(data, '补料记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 5cee216f1..250073f0d 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -35,7 +35,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault:1,
   },
   {
     label: '任务单号',
@@ -44,7 +44,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 2,
   },
   // {
   //   label: '供应商代码',
@@ -226,6 +226,15 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 578d0b2ed..f1429b571 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -87,6 +87,7 @@ import { RepleinshRequestMain,RepleinshRequestMainRules,RepleinshRequestDetail,R
 import * as RepleinshRequestMainApi from '@/api/wms/repleinshRequestMain'
 import * as RepleinshRequestDetailApi from '@/api/wms/repleinshRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 补料申请
 defineOptions({ name: 'RepleinshRequestMain' })
@@ -236,7 +237,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -247,7 +248,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -258,7 +259,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -269,7 +270,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -280,7 +281,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -291,7 +292,7 @@ const buttonTableClick = async (val, row) => {
     RepleinshRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -331,7 +332,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -344,7 +345,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(tableObject.params)
-    download.excel(data, '补料申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -404,7 +405,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -419,7 +424,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '补料申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 277c38782..e6a3daef5 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -403,6 +403,15 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index 6674ef44d..bb57a9d99 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -183,7 +183,16 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable: false
+    isTable: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 1f1d10ecc..7ad146b27 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -298,7 +298,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -309,7 +309,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -320,7 +320,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -331,7 +331,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => {
     InventorychangeRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -393,7 +393,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -508,7 +508,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 16f285994..84ef721ef 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -273,6 +273,15 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false,
     isTable: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index 582b7104b..496dd016e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -272,13 +272,13 @@ const buttonTableClick = async (val, row) => {
     InventorymoveJobMainApi.executeInventorymoveMain(row.masterId)
   } else if (val == 'mainJobAba') { // 放弃
     await InventorymoveJobMainApi.abandonInventorymoveMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await InventorymoveJobMainApi.closeInventorymoveMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await InventorymoveJobMainApi.acceptInventorymoveMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 1a9a2419c..6f0905ed8 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -16,20 +16,20 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -503,6 +503,15 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index aebbaa0dc..4fed4c42e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -103,7 +103,8 @@ const { tableObject, tableMethods } = useTable({
  if ( routeName.value == 'OktoholdRecordMain') {
   tableObject.params = {
     fromInventoryStatus: 'OK',
-    toInventoryStatus:'HOLD'
+    toInventoryStatus: 'HOLD',
+    businessType:'OkToHold'
   }
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "HOLD"
@@ -111,7 +112,8 @@ const { tableObject, tableMethods } = useTable({
 } else if ( routeName.value == 'NoktoholdRecordMain') {
   tableObject.params = {
     fromInventoryStatus: 'NOK',
-    toInventoryStatus:'HOLD'
+    toInventoryStatus:'HOLD',
+    businessType:'Move'
   }
   fromInventoryStatus.value = 'NOK'
   toInventoryStatus.value = "HOLD"
@@ -119,7 +121,8 @@ const { tableObject, tableMethods } = useTable({
 }else if ( routeName.value == 'HoldtookRecordMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    toInventoryStatus:'OK',
+    businessType:'NokToHold'
   }
   fromInventoryStatus.value = 'HOLD'
   toInventoryStatus.value = "OK"
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index 9611e7f26..6c3323a0a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -267,6 +267,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
new file mode 100644
index 000000000..35b55234f
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -0,0 +1,455 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRecordMainNew.allSchemas"
+      :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <!-- isCheckStrictly 取消主子关联 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    :isCheckStrictly="true" 
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="InventorymoveRequestMainRules"
+    :formAllSchemas="InventorymoveRequestMain.allSchemas"
+    :tableAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :tableFormRules="InventorymoveRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorymoveRequestMainApi.updateInventorymoveRequestMain"
+    :apiCreate="InventorymoveRequestMainApi.createInventorymoveRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRecordMainNew.allSchemas"
+    :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
+    :detailAllSchemasRules="InventorymoveRecordDetailNewRules"
+    :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
+  />
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
+<!-- 导入 -->
+<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/importMove" :importTemplateData="importTemplateData"
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InventorymoveRecordMainNew,InventorymoveRecordDetailNew,InventorymoveRecordDetailNewRules } from './inventorymoveRecordMainNew.data'
+import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRecordRequestMain.data'
+import {
+  SupplierdeliverRequestPackage
+} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+
+import { getAccessToken } from '@/utils/auth'
+
+import * as PackageApi from '@/api/wms/package'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
+import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
+import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+// 库存转移记录主
+defineOptions({ name: 'InventorymoveRecordMainNew' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const importFileName = ref()
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...InventorymoveRecordMainNew.allSchemas.tableColumns,...InventorymoveRecordDetailNew.allSchemas.tableMainColumns])
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口
+})
+tableObject.params.businessType = 'Move'
+
+// 判断 路由名称 进行条件过滤
+console.log(146 , fromInventoryStatus.value)
+fromInventoryStatus.value = null
+importFileName.value = '库存移动记录'
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入
+  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 == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 列表-操作按钮
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  // if(findIndex>-1&&findIndex<$index){
+  //   return []
+  // }
+  return [
+    defaultButtons.mainListPointBtn(null), // 标签打印
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    labelPrint(row)
+  }
+}
+const BASE_URL = getJmreportBaseUrl()
+// 标签打印
+const searchTableRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等
+//获取类型
+const getLabelType = async (row,useToPackingNumber)=>{
+  let resType = await PackageApi.getPackagePage(useToPackingNumber?{
+    number: row.toPackingNumber
+  }:{
+    requestNumber:  row.number
+  })
+  console.log('resType',resType)
+  if(resType.list.length > 0){
+    if (resType.list[0].productionLineCode != null) {
+      labelType.value = 'zz'
+    } else {
+      labelType.value = 'cg'
+    }
+  }else{
+    getLabelType(row,true)
+  }
+}
+const getLabelDetailPage = async (row,useToPackingNumber)=>{
+  let defaultParams = {'moduleName':'move','recordNumber':row.number}
+  if(useToPackingNumber){
+    defaultParams = {'moduleName':'move','recordNumber':row.toPackingNumber}
+  }
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  await getListPrint()
+  if(!useToPackingNumber&&(!tableObjectPrint || !tableObjectPrint.tableList || tableObjectPrint.tableList.length==0)){
+    getLabelDetailPage(row,true)
+    return
+  }
+  console.log('tableObjectPrint',tableObjectPrint)
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  //获取类型
+  await getLabelType(row,false)
+  await getLabelDetailPage(row,false)
+  
+}
+// 批量打印--预生产收货
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordInventorymoveMain")
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
+    download.excel(data, '库存转移记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorymoveRecordDetailNew.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item => {
+    item.toBatch = item.fromBatch
+    item.fromLocationCode = data.fromLocationCode
+    item.toLocationCode = data.toLocationCode
+    item.toInventoryStatus = data.toInventoryStatus
+    
+    if(item.qty == 0){
+      message.error(`数量不能为0!`)
+      flag.value = true
+      return;
+    }
+  })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  formRef.value.formLoading = true
+  console.log('data',data)
+  try {
+    if (formType === 'create') {
+      await InventorymoveRecordMainApi.createInventorymoveRecordMain(data)
+      message.success(t('common.createSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'itemCode'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['origin_fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        if(val.length==0) return
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['toPackingNumber'] = item['packingNumber']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['origin_fromLocationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          if(item['packingNumber']&&item['packingNumber'].length>0){
+            newRow['packUnit'] = item['packUnit']
+            newRow['packQty'] = item['packQty']
+          }else{
+            newRow['packUnit'] = ''
+            newRow['packQty'] = ''
+          }
+          newRow['disabled_qty'] = item['packingNumber']&&item['packingNumber'].length>0
+          tableData.value.push(newRow)
+        })
+      }else if(formField == 'packUnit'){
+        //包装规格
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField=='fromLocationCode'){
+        //从库位代码
+        setV['fromWarehouseCode'] = val[0]['warehouseCode']
+      }else if(formField=='toLocationCode'){
+        //到库位代码
+        setV['toWarehouseCode'] = val[0]['warehouseCode']
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: importFileName.value + '.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: [...searchData.filters,{
+      action: "==",
+      column: "business_type",
+      value: "Move"
+    }]
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  if(routeName.value == "InventorymoveRecordMain"){
+    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
+  }else {
+    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+  }
+})
+</script>
+./inventorymoveRecordRequestMain.data
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
new file mode 100644
index 000000000..aba057022
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
@@ -0,0 +1,775 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 库存转移记录主表
+ */
+export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isSearch: true
+  // },
+  // {
+  //   label: '任务单号',
+  //   field: 'jobNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isSearch: true
+  // },
+  // {
+  //   label: '使用在途库',
+  //   field: 'useOnTheWayLocation',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '申请时间',
+  //   field: 'requestTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '执行时间',
+  //   field: 'executeTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '生效日期',
+  //   field: 'activeDate',
+  //   formatter: dateFormatter2,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'date',
+  //       dateFormat: 'YYYY-MM-DD',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '发货单号',
+  //   field: 'asnNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:22
+
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:23
+  },
+  // {
+  //   label: '从库区类型范围',
+  //   field: 'fromAreaTypes',
+  //   dictType: DICT_TYPE.AREA_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到库区类型范围',
+  //   field: 'toAreaTypes',
+  //   dictType: DICT_TYPE.AREA_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从库区代码范围',
+  //   field: 'fromAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到库区代码范围',
+  //   field: 'toAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:24
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:25
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:36
+  },
+
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    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')]
+      }
+    },
+    sortTableDefault:34
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:35
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorymoveRecordMainNewRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移记录子表
+ */
+export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:10,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:27
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:28
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:29
+  },
+  // {
+  //   label: '在途库库位',
+  //   field: 'onTheWayLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:18
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:19
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12
+  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:17
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:30
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:14
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:15
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:16
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:31
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:32
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:20
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:21
+  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '接口类型',
+  //   field: 'interfaceType',
+  //   dictType: DICT_TYPE.INTERFACE_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '创建者',
+  //   field: 'creator',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const InventorymoveRecordDetailNewRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
new file mode 100644
index 000000000..b35bd6e88
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
@@ -0,0 +1,458 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as ItempackagingApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@//views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MoveRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 库存转移申请主表
+ */
+export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'businessType',
+        value: 'Move',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'businessType',
+        value: 'Move',
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+      type: 'Select'
+    },
+    form: {
+      value:'OK',
+      componentProps: {
+        disabled: false,
+      }
+    }
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const InventorymoveRequestMainRules = reactive({
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ]
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      disabled: true,
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
+      searchCondition: [{
+          key: 'businessType',
+          value: 'Move',
+          isMainValue: false
+      },{
+        key:'locationCode', // 查询列表中字段
+        value:'fromLocationCode', // 指主表某字段 
+        message: '请选择从库位代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true, // 表示查询条件是主表的字段的值
+        action: '==', // 查询拼接条件
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
+        searchCondition: [{
+            key: 'businessType',
+            value: 'Move',
+            isMainValue: false
+        }]
+      }
+    }
+    
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    isForm: false,
+    tableForm:{
+      multiple:false,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'packUnit',
+      searchTitle: '物料包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItempackagingApi.getItempackagingPageTree,
+      searchCondition: [{
+        key:'itemCode', // 查询列表中字段
+        value:'itemCode', // 指主表某字段 
+        message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true, // 表示查询条件是主表的字段的值
+        action: '==', // 查询拼接条件
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'packUnit',
+        searchTitle: '物料包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItempackagingApi.getItempackagingPageTree,
+        searchCondition: [{
+          key:'itemCode', // 查询列表中字段
+          value:'itemCode', // 指主表某字段 
+          message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
+          isMainValue: true, // 表示查询条件是主表的字段的值
+          action: '==', // 查询拼接条件
+        }]
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: false,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toInventoryStatus: [
+    { required: true, message: '请选择到库存状态', trigger: 'change' }
+  ]
+})
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index d7c1d4a8c..499e908c3 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -510,7 +510,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -521,7 +521,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -532,7 +532,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -543,7 +543,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -554,7 +554,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -565,7 +565,7 @@ const buttonTableClick = async (val, row) => {
     InventorymoveRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -627,7 +627,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -743,7 +743,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 5899a7623..28768dd0f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -117,6 +117,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    isTableForm:false,
     isForm: false,
   },
   {
@@ -388,7 +390,16 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-    isTable: true
+    isTable: true,
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -691,6 +702,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTableForm:false,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
@@ -927,9 +939,9 @@ export const InventorymoveRequestDetailRules = reactive({
   fromInventoryStatus: [
     { required: true, message: '请选择从库存状态', trigger: 'change' }
   ],
-  toLocationCode: [
-    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  ],
+  // toLocationCode: [
+  //   { required: true, message: '请选择到库位代码', trigger: 'change' }
+  // ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
new file mode 100644
index 000000000..7ddee302a
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -0,0 +1,820 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...InventorymoveRequestMain.allSchemas.searchSchema,...InventorymoveRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InventorymoveRequestMain.allSchemas"
+      :detailAllSchemas="InventorymoveRequestDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :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,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="fromPackingNumber"
+    @success="getList"
+    :rules="InventorymoveRequestMainRules"
+    :formAllSchemas="InventorymoveRequestMain.allSchemas"
+    :tableAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :tableFormRules="InventorymoveRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="InventorymoveRequestMainApi.updateInventorymoveRequestMain"
+    :apiCreate="InventorymoveRequestMainApi.createInventorymoveRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="InventorymoveRequestMain.allSchemas"
+    :detailAllSchemas="InventorymoveRequestDetail.allSchemas"
+    :detailAllSchemasRules="InventorymoveRequestDetailRules"
+    :apiCreate="InventorymoveRequestDetailApi.createInventorymoveRequestDetail"
+    :apiUpdate="InventorymoveRequestDetailApi.updateInventorymoveRequestDetail"
+    :apiPage="InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage"
+    :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/inventorymove-request-main/import" :importTemplateData="importTemplateData"
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRequestMain.data'
+import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
+import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as LocationApi  from '@/api/wms/location'
+
+// 库存转移申请
+defineOptions({ name: 'InventorymoveRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...InventorymoveRequestMain.allSchemas.tableColumns,...InventorymoveRequestDetail.allSchemas.tableMainColumns])
+const businessType = ref()
+
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+const importFileName = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdRequestMain') {
+  tableObject.params = {
+    toInventoryStatus:'HOLD'
+  }
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'OkToHold'
+  importFileName.value = '物料转隔离申请'
+}
+// else if ( routeName.value == 'NoktoholdRequestMain') {
+//   tableObject.params = {
+//     fromInventoryStatus: 'NOK',
+//     toInventoryStatus:'HOLD'
+//   }
+//   fromInventoryStatus.value = 'NOK'
+//   toInventoryStatus.value = "HOLD"
+//   businessType.value = 'NokToHold'
+//   importFileName.value = '不合格转隔离申请'
+// }
+ else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'OK'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "OK"
+  businessType.value = 'HoldToOk'
+  importFileName.value = '隔离转合格申请'
+} else if ( routeName.value == 'HoldtoscrapRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'HOLD',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'HOLD'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'HoldToScrap'
+  importFileName.value = '隔离转报废申请'
+} else if ( routeName.value == 'OktoscrapRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "SCRAP"
+  businessType.value = 'OkToScrap'
+  importFileName.value = '合格转报废申请'
+} 
+// else if ( routeName.value == 'ScraptoholdRequestMain') {
+//   tableObject.params = {
+//     fromInventoryStatus: 'SCRAP',
+//     toInventoryStatus:'HOLD'
+//   }
+//   fromInventoryStatus.value = 'SCRAP'
+//   toInventoryStatus.value = "HOLD"
+//   businessType.value = 'ScrapToHold'
+//   importFileName.value = '报废转隔离申请'
+// } 
+else if( routeName.value == 'InventorymoveRequestMain'){
+  fromInventoryStatus.value = null
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
+}else {
+  tableObject.params = {
+    fromInventoryStatus: 'OK',
+    toInventoryStatus:'SCRAP'
+  }
+}
+console.log(99 ,  businessType.value)
+InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
+  if(item.field == 'fromWarehouseCode') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+})
+// 修改 tableform 属性
+InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'fromPackingNumber') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+    }else if (toInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+      }]
+    }
+  }
+})
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+// 物料隔离-获取到库位默认值
+const getDefaultToLocationCode = async ()=>{
+  let searchCondition = []
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+    if(item.field == "toLocationCode"){
+      searchCondition = item.tableForm.searchCondition
+    }
+  })
+  let params = {}
+  searchCondition.forEach(item=>{
+    if(item['isMainValue']){
+      params[item['key']] = formRef.value.formRef.formModel[item['value']]
+    }else{
+      params[item['key']] = item['value']
+    }
+  })
+  let res = await LocationApi.selectBusinessTypeToLocation(params)
+  console.log('res',res)
+ if(res&&res.list.length>0){
+  tableData.value.forEach(item=>{
+    if(!item['toLocationCode']){
+      item['toLocationCode'] = res.list[0]['code']
+    }
+  })
+ }
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      if(formField == 'fromPackingNumber'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+        if(val.length==0) return
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['fromPackingNumber'] = item['packingNumber']
+          newRow['fromContainerNumber'] = item['containerNumber']
+          newRow['itemCode'] = item['itemCode']
+          newRow['fromBatch'] = item['batch']
+          newRow['fromInventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          if(routeName.value == 'OktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
+          }else if(routeName.value == 'NoktoholdRequestMain'){
+            newRow['toInventoryStatus'] = "HOLD"
+          }else if ( routeName.value == 'HoldtookRequestMain') {
+            newRow['toInventoryStatus'] = "OK"
+          }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'OktoscrapRequestMain') {
+            newRow['toInventoryStatus'] = "SCRAP"
+          }else if ( routeName.value == 'ScraptoholdRequestMain') {
+            newRow['toInventoryStatus'] = "HOLD"
+          }else{
+            newRow['toInventoryStatus'] = item['inventoryStatus']
+          }
+          tableData.value.push(newRow)
+        })
+        if(routeName.value == 'OktoholdRequestMain'){
+          getDefaultToLocationCode()
+        }
+      } else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if (formField == 'fromWarehouseCode') {
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+          key: 'warehouseCode',
+          value: val[0]["code"],
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = val[0]["code"]
+          }
+        })
+      }
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    if(formField == 'fromPackingNumber') {
+      setV['fromPackingNumber'] = val[0]['packingNumber']
+      setV['fromContainerNumber'] = val[0]['containerNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['fromBatch'] = val[0]['batch']
+      setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
+      if(routeName.value == 'OktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
+      }else  if(routeName.value == 'NoktoholdRequestMain'){
+        setV['toInventoryStatus'] = "HOLD"
+      }else if ( routeName.value == 'HoldtookRequestMain') {
+        setV['toInventoryStatus'] = "OK"
+      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
+      }else if ( routeName.value == 'ScraptoholdRequestMain') {
+        setV['toInventoryStatus'] = "HOLD"
+      }else{
+        setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      }
+    } else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除
+    ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.close(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.reAdd(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.submit(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.refused(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.agree(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要处理吗？')
+    tableObject.loading = true
+    InventorymoveRequestMainApi.handle(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.masterId)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+/**
+ * 详情 新增/编辑事件
+ */
+const detailOpenForm = (type, row) => {
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+          key: 'warehouseCode',
+          value: fromWarehouseCodeMain.value,
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = fromWarehouseCodeMain.value
+          }
+        })
+      }
+}
+
+const fromWarehouseCodeMain = ref()
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  fromWarehouseCodeMain.value = row.fromWarehouseCode
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"requestInventorymoveMain")
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await InventorymoveRequestMainApi.deleteInventorymoveRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    if(routeName.value == 'OktoholdRequestMain'){
+      const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
+      download.excel(data, '物料转隔离申请主.xlsx')
+        }else if ( routeName.value == 'HoldtookRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
+          download.excel(data, '隔离转合格申请主.xlsx')
+        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
+          download.excel(data, '隔离转报废申请主.xlsx')
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+          const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
+          download.excel(data, '合格转报废申请主.xlsx')
+        }
+        // else if ( routeName.value == 'ScraptoholdRequestMain') {
+        //   const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
+        //   download.excel(data, '报废转隔离申请主.xlsx')
+        // }
+        else{
+          const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
+          download.excel(data, '库存转移申请主.xlsx')
+        }
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+//为true表示子表数据中存在数量为0的数据
+const flag = ref()
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+  let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  let isExist = false
+  tableData.value.forEach(item => {
+    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+    console.log(rs,5666);
+   if(rs.length > 1) isExist = true
+  })
+  if (isExist) {
+    formRef.value.formLoading = false
+    isExist = false
+    return message.warning('包装号重复')
+  }
+  flag.value = false
+  data.subList.forEach(item => {
+    console.log(556565,item);
+    if(fromInventoryStatus.value){
+      item.fromInventoryStatus = fromInventoryStatus.value
+      item.toInventoryStatus = toInventoryStatus.value
+    }
+    if(item.qty == 0){
+      message.error(`到数量不能为0!`)
+      flag.value = true
+      return;
+    }
+          })
+  if(flag.value){
+    formRef.value.formLoading = false
+    return
+  }
+  formRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await InventorymoveRequestMainApi.updateInventorymoveRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: importFileName.value + '.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  if(routeName.value == "InventorymoveRequestMain"){
+    importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate()
+  }else {
+    importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove()
+  }
+})
+</script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
new file mode 100644
index 000000000..6f6e21b82
--- /dev/null
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -0,0 +1,948 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'MoveRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+/**
+ * @returns {Array} 库存转移申请主表
+ */
+export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库基础信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择从仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库基础信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isForm: false,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '从库区类型范围',
+  //   field: 'fromAreaTypes',
+  //   // dictType: DICT_TYPE.AREA_TYPE,
+  //   // dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '从库区代码范围',
+  //   field: 'fromAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+
+  // {
+  //   label: '到库区类型范围',
+  //   field: 'toAreaTypes',
+  //   // dictType: DICT_TYPE.AREA_TYPE,
+  //   // dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: true,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '到库区代码范围',
+  //   field: 'toAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '业务类型',
+  //   field: 'businessType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     value: 'Move',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   isForm: false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+  //     return userDeptArray.find((account) => account.id == cellValue)?.name
+  //   },
+  //   form: {
+  //     value: userDept.id,
+  //     component: 'Select',
+  //     api: () => userDeptArray,
+  //     componentProps: {
+  //       disabled: true,
+  //       optionsAlias: {
+  //         labelField: 'name',
+  //         valueField: 'id'
+  //       }
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
+  // {
+  //   label: '自动提交',
+  //   field: 'autoCommit',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoCommit,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动通过',
+  //   field: 'autoAgree',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoAgree,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoExecute',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoExecute,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '使用在途库',
+  //   field: 'useOnTheWayLocation',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: true,
+    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')]
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestMainRules = reactive({
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    hiddenInMain: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择从包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择从包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
+      }
+    }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm:true,
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+      searchCondition: [
+      {
+        key: 'type',
+        value: 'businessType',
+        isMainValue: true
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }],
+      isRepeat:true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'type',
+            value: 'businessType',
+            isMainValue: true
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    hiddenInMain: true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    hiddenInMain: true,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    hiddenInMain: true,
+  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    hiddenInMain: true,
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const InventorymoveRequestDetailRules = reactive({
+  itemCode: [
+    { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  fromInventoryStatus: [
+    { required: true, message: '请选择从库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/moveManage/itemChange/itemChange.data.ts b/src/views/wms/moveManage/itemChange/itemChange.data.ts
index 8d91875d9..6415e0ac9 100644
--- a/src/views/wms/moveManage/itemChange/itemChange.data.ts
+++ b/src/views/wms/moveManage/itemChange/itemChange.data.ts
@@ -414,7 +414,16 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
index d1aa1db58..c0d765bc2 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
@@ -217,6 +217,15 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
  
 ]))
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
index c04743a7b..fced86acb 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
@@ -237,7 +237,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProcessproductionRecordMainApi.exportProcessproductionRecordMain(tableObject.params)
-    download.excel(data, '工序报产申请主.xlsx')
+    download.excel(data, route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
index ba0c04612..523d2d328 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
@@ -94,7 +94,16 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 469b3e238..d9d638d38 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -156,7 +156,16 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     },
     isTableForm: false,
     isForm: false,
-    isTable: false
+    isTable: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
index 1a49df43c..f44ac6612 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -307,6 +307,15 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index 2f0fe286e..02fea97a1 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -215,6 +215,15 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index a97fc2653..19a0dd669 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -240,6 +240,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTable: false,
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 70e5f5693..c107abc6d 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => {
       }
       // message.success(t('common.updateSuccess'))
       // tableObject.loading = false
-      // getList()
+      // buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -408,7 +408,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -420,7 +420,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
       // 生成发料申请
       ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
@@ -434,7 +434,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -481,7 +481,7 @@ const autoCreatePlanRequest = async (row)=>{
     } finally {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }
   }
 }
@@ -534,7 +534,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -607,7 +607,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
 
   } finally {
     formRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index fb50dea45..f54be98de 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -573,6 +573,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index db022f33e..d9923a922 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -314,7 +314,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -325,7 +325,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => {
       }
       // message.success(t('common.updateSuccess'))
       // tableObject.loading = false
-      // getList()
+      // buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -398,7 +398,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -421,7 +421,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
       // 生成发料申请
       ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
@@ -435,7 +435,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -497,7 +497,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -572,7 +572,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -609,7 +613,7 @@ const autoCreatePlanRequest = async (row)=>{
     } finally {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }
   }
 }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index b66a906aa..a68c9f096 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -572,6 +572,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index f18d7babd..f289523a4 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => {
       }
       // message.success(t('common.updateSuccess'))
       // tableObject.loading = false
-      // getList()
+      // buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -386,7 +386,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
       // 生成发料申请
       ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
@@ -423,7 +423,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -485,7 +485,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -559,7 +559,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -598,7 +602,7 @@ const autoCreatePlanRequest = async (row)=>{
     } finally {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }
   }
 }
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index ece420527..e51d25451 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -565,6 +565,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 37d343540..3585c8f56 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -332,7 +332,8 @@ const buttonTableClick = async (val, row) => {
       }
       // message.success(t('common.updateSuccess'))
       // tableObject.loading = false
-      // getList()
+      // buttonBaseClick('refresh',null)
+
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -343,7 +344,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -355,7 +356,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -387,7 +388,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -398,7 +399,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -410,7 +411,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
       // 生成发料申请
       ProductionMainApi.generateIssueRequest(PreparetoissueRes.number)
     }).catch(err => {
@@ -424,7 +425,7 @@ const buttonTableClick = async (val, row) => {
     await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -486,7 +487,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -562,7 +563,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
@@ -600,7 +605,7 @@ const autoCreatePlanRequest = async (row)=>{
     } finally {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }
   }
 }
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index fd3f997e5..82a6ceb40 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -565,6 +565,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index a81de7ad2..699d01705 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -173,7 +179,11 @@ const formsSuccess = async (formType,data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  if (formType === 'create') {
+    getList()
+  }else{
+    buttonBaseClick('refresh',null)
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
index 21f5e26ea..97e776d34 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts
@@ -62,10 +62,16 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划类型',
     field: 'planType',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    form: {
-      component: 'SelectV2'
+    table: {
+      width: 150
     },
+    form: {
+      component: 'Select'
+    }
   },
   {
     label: '业务类型',
@@ -94,7 +100,16 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 57a431d19..c14093312 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => {
     // ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'documentPrint') {
     // 单据打印
     handleDocumentPrint(row)
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index c1e1e78d0..5a48e1134 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -15,6 +15,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
   {
     label: '状态',
     field: 'status',
@@ -27,16 +37,6 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTable: false,
-    isSearch: true,
-  },
   // {
   //   label: '供应商代码',
   //   field: 'supplierCode',
@@ -309,6 +309,15 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index 94487c419..b38e6b264 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -35,7 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
     isSearch: true
   },
   {
@@ -45,7 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
     isSearch: true
   },
   // {
@@ -226,6 +226,15 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
 
   {
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 5e3567de0..f1d1619f0 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -232,7 +232,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -243,7 +243,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -254,7 +254,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -265,7 +265,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -276,7 +276,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -287,7 +287,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -327,7 +327,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -397,7 +397,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 2b5d2e897..f315502ab 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -146,7 +146,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -155,7 +155,16 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
@@ -802,7 +811,6 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       fixed: 'right'
     },
-    hiddenInMain:true,
     isTableForm:false,
   }
 ]))
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index a7ba72a23..a6fe1a158 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -203,13 +203,13 @@ const buttonTableClick = async (val, row) => {
     // ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }else if (val == 'documentPrint') {
     // 单据打印
     handleDocumentPrint(row)
@@ -249,7 +249,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
-    download.excel(data, '制品上架任务主.xlsx')
+    download.excel(data,  route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index b7e20f429..3d7ca5bf4 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -15,6 +15,15 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
   {
     label: '状态',
     field: 'status',
@@ -27,16 +36,6 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isSearch: true,
-    isTable: false,
-  },
   // {
   //   label: '供应商代码',
   //   field: 'supplierCode',
@@ -311,6 +310,15 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index 622847e52..d1451da7b 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -156,7 +156,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
-    download.excel(data, '制品上架记录主.xlsx')
+    download.excel(data, route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index 1bea38b90..57b04a37f 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -35,8 +35,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
-    isSearch: true
+    isSearch: true,
+    sortTableDefault: 1,
   },
   {
     label: '任务单号',
@@ -45,8 +45,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
-    isSearch: true
+    isSearch: true,
+    sortTableDefault: 1,
   },
   // {
   //   label: '供应商代码',
@@ -226,6 +226,15 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
 
   {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index d3082f024..28366c9bf 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -234,7 +234,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -245,7 +245,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -256,7 +256,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -267,7 +267,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -278,7 +278,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -289,7 +289,7 @@ const buttonTableClick = async (val, row) => {
     ProductputawayRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -329,7 +329,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -344,7 +344,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductputawayRequestMainApi.exportProductputawayRequestMainAssemble(tableObject.params)
-    download.excel(data, '制品上架申请主.xlsx')
+    download.excel(data,  route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -398,7 +398,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index cd3da472d..e836f1931 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -147,7 +147,16 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index b9a0ae9fa..253fb0f49 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -322,13 +322,13 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 6f8011f4c..45a93e713 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -350,6 +350,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 3811c3b89..8493a2bd0 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -211,7 +211,7 @@ const buttonTableClick = async (val, row) => {
 const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const searchTableRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
+const labelType = ref('') // 标签类别 采购还是制造等
 const labelPrint = async (row) => {
   tableObject.loading = true
   //获取类型
@@ -243,7 +243,7 @@ const labelPrint = async (row) => {
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
- 
+
   if(val.length == 0){
     message.warning("请先选择要打印的数据!")
     return
@@ -279,7 +279,7 @@ const handleCreateInspectRequest = async (number:string) => {
     tableObject.loading = true
     await ProductreceiptRecordMainApi.createInspectRequest(number)
     message.success(t('ts.到货检验申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 04036f02b..cb57f422f 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -251,6 +251,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 61f4c5984..f5f87a731 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -367,7 +367,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -389,7 +389,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -400,7 +400,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       console.log(err)
     })
@@ -552,7 +552,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -626,7 +626,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index f372eec7b..94b31e711 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -347,7 +347,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: false,
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index 195d84712..dac357f0d 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -262,13 +262,13 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index a0ba771f6..029ec1ca1 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -352,6 +352,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 5bc4a178a..67e177c28 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -255,7 +255,7 @@ const handleCreateInspectRequest = async (number:string) => {
     tableObject.loading = true
     await ProductreceiptRecordMainApi.createInspectRequest(number)
     message.success(t('ts.到货检验申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -268,7 +268,7 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = true
     await ProductreceiptRecordMainApi.createPutawayRequest(number)
     message.success(t('ts.上架申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index a39bc62f8..24bb9c07b 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -255,6 +255,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 4864d6187..37b729e3f 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -366,7 +366,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -377,7 +377,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -388,7 +388,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -399,7 +399,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       console.log(err)
     })
@@ -552,7 +552,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -627,7 +627,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 6c1efc524..1688ced9e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -355,7 +355,17 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: false,
-    isForm: false
+    isForm: 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')]
+      },
+    },
+
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 7a96fc26d..995a10ac6 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -259,13 +259,13 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 // 获取部门 用于详情 部门回显
@@ -287,7 +287,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
-    download.excel(data, '制品收货任务.xlsx')
+    download.excel(data, route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index 9c906dc83..d047bd058 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -334,6 +334,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index e9a0eb4cd..69439d8b4 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -199,7 +199,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
-    download.excel(data, '制品收货记录主.xlsx')
+    download.excel(data, route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
index bc903136b..1f13ef026 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts
@@ -239,6 +239,15 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index a0398bac6..2fa3d5bd2 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -354,7 +354,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -376,7 +376,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -387,7 +387,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -480,7 +480,7 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       console.log(err)
     })
@@ -539,7 +539,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -554,7 +554,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
-    download.excel(data, '制品收货申请主.xlsx')
+    download.excel(data, route.meta.title+'.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -612,7 +612,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index a21f40e59..929e92008 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -366,7 +366,16 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: false,
-    isForm: false
+    isForm: 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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index 51e97a100..19de72466 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -96,7 +96,13 @@ const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -133,13 +139,13 @@ const buttonTableClick = async (val, row) => {
     handleDelete(row.masterId)
   } else if (val == 'mainJobAba') { // 放弃
     await ProductredressJobMainApi.abandonProductredressJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     await ProductredressJobMainApi.closeProductredressJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     await ProductredressJobMainApi.acceptProductredressJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 
@@ -176,7 +182,7 @@ const handleDelete = async (id: number) => {
     await ProductredressJobMainApi.deleteProductredressJobMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index e9b7dabd9..89d853a3d 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -407,7 +407,16 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
index 9cf2196de..f85fe1943 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -94,7 +94,13 @@ const buttonBaseClick = (val, item) => {
    if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index d1919b684..d0518f979 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -300,7 +300,16 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index a58f08d13..8a9c000a3 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -208,7 +208,13 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
-    getList()
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -249,7 +255,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -260,7 +266,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -271,7 +277,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -282,7 +288,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -293,7 +299,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -304,7 +310,7 @@ const buttonTableClick = async (val, row) => {
     ProductredressRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       console.log(err)
     })
@@ -361,7 +367,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}finally{
       tableObject.loading = false
     }
@@ -432,7 +438,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index facb6d0d4..7ec65d060 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -251,7 +251,16 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: 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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 1ce8bcec4..18eaba2c4 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -226,6 +226,15 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '最后更新时间',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 3fa3c6f93..ba37189ef 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -330,6 +330,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: 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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index b17908398..76405880a 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -182,7 +182,8 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.id
+      masterId: row.masterId,
+      itemCode: row.itemCodeThird
     }
     await getDetailListBom()
   }
@@ -204,7 +205,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  //defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index fe3d913bd..76301b377 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -296,7 +296,16 @@ export const ProductscrapRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        },
+      },
     },
     {
       label: '最后更新时间',
@@ -375,7 +384,7 @@ export const ProductscrapRecordMain = useCrudSchemas(
       field: 'available',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string',
-      isSearch: true,
+      isSearch: false,
       isTable: false,
       sort: 'custom',
       table: {
@@ -473,15 +482,16 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '制品物料代码',
     field: 'itemCode',
+    isSearch:true,
     sort: 'custom',
     table: {
       width: 150
     }
   },
   {
-    label: '物料名称',
+    label: '制品物料名称',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -506,7 +516,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '报废数量',
+    label: '制品报废数量',
     field: 'qty',
     sort: 'custom',
     table: {
@@ -517,7 +527,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '计量单位',
+    label: '制品计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
@@ -528,9 +538,52 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '单价',
-    field: 'singlePrice',
+    label: '原料物料代码',
+    field: 'itemCodeThird',
+    sort: 'custom',
+    isSearch:true,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '原料物料名称',
+    field: 'itemNameThird',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '原料报废数量',
+    field: 'qtyThird',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '原料计量单位',
+    field: 'uomThird',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '原料单价',
+    field: 'singlePriceThird',
     sort: 'custom',
+    isTable: true,
     table: {
       width: 150
     },
@@ -539,9 +592,10 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: '原料金额',
+    field: 'amountThird',
     sort: 'custom',
+    isTable: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 29439169f..31d59a712 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -528,7 +528,7 @@ const handleClose = async (id: number) => {
     await ProductscrapRequestMainApi.closeProductscrapRequestMain(id)
     message.success(t('common.closeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -542,7 +542,7 @@ const handleReAdd = async (id: number) => {
     await ProductscrapRequestMainApi.reAddProductscrapRequestMain(id)
     message.success(t('common.reAddSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -556,7 +556,7 @@ const handleSubmit = async (id: number) => {
     await ProductscrapRequestMainApi.submitProductscrapRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -570,7 +570,7 @@ const handleRefused = async (id: number) => {
     await ProductscrapRequestMainApi.refusedProductscrapRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -584,7 +584,7 @@ const handleAgree = async (id: number) => {
     await ProductscrapRequestMainApi.agreeProductscrapRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -598,7 +598,7 @@ const handleHandle = async (id: number) => {
     await ProductscrapRequestMainApi.handleProductscrapRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -663,7 +663,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -756,7 +756,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
-    getList()
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 6067ca3e1..f3ce47a15 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -383,7 +383,16 @@ export const ProductscrapRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isForm: false
+      isForm: 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')]
+        },
+      },
     },
     {
       label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index b2779c087..73a95c56b 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -73,6 +73,7 @@ import * as InspectJobMainApi from '@/api/wms/inspectJobMain'
 import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 检验任务主
 defineOptions({ name: 'InspectJobMain' })
 
@@ -233,7 +234,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
-    download.excel(data, '检验任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
index 4920252e9..848a37dc4 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
@@ -271,6 +271,15 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index b7f63eff1..a987cad02 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -72,6 +72,7 @@ import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import  Preview  from '@/components/UploadFile/src/Preview.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 检验记录主
 defineOptions({ name: 'InspectRecordMain' })
 
@@ -179,7 +180,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
-    download.excel(data, '检验记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 91b579ad2..4cbc8f5df 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -53,6 +53,7 @@
   import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
   import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import { formatDate } from '@/utils/formatTime'
 
   // 到货检验申请
   defineOptions({ name: 'InspectRequestMain' })
@@ -322,7 +323,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
-      download.excel(data, '检验申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -385,7 +386,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '检验申请主导入模版.xlsx'
+    templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
 
   // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index ad80329e8..7a29f4b94 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -373,6 +373,15 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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,
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 80dbd8b06..6cf95dc4e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -104,6 +104,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -363,7 +364,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
-    download.excel(data, '采购收货任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index c5bc9e337..86762ce33 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -52,7 +52,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
       label: '供应商代码',
       field: 'supplierCode',
       sort: 'custom',
-      sortTableDefault: 1,
       table: {
         width: 150
       },
@@ -414,7 +413,16 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      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')]
+        }
+      },
     },
     {
       label: '自动完成',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index b51dbbefd..8eb9603f4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -115,6 +115,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+
+import { formatDate } from '@/utils/formatTime'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 const message = useMessage() // 消息弹窗
@@ -303,10 +305,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 05bbd18c6..2d8d0ba03 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -373,9 +373,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetimerange',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
     form: {
@@ -385,7 +385,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    },
+    }
   },
   {
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
index c96206f80..2dcb35833 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -115,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordRefuseMain' })
 const message = useMessage() // 消息弹窗
@@ -292,10 +293,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
-      download.excel(data, `${t('ts.采购拒收记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
index 6dce3f6d0..b5c0fbd48 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts
@@ -412,6 +412,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index d7dd91517..c05b715f6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -762,7 +762,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, '采购收货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -838,7 +838,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 68e62984c..1c7bf9ea8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -326,7 +326,17 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
+
   },
   {
     label: '创建者',
@@ -1027,6 +1037,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         value: 'in',
         isMainValue: false
         }],
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       verificationParams: [{
         key: 'code',
         action: '==',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index d472bab8e..ad1fd9943 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -691,7 +691,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, '采购收货申请主.xlsx')
+    download.excel(data, 'M类型采购收货.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index 9458a4b92..d84f01b0d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -331,7 +331,16 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
@@ -997,13 +1006,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm: {
-      enterSearch: true,
+      enterSearch: false,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '库位信息', // 查询弹窗标题
       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchPage: LocationApi.getLocationMPage, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 07e80cbb0..e5365a2ca 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -73,6 +73,7 @@ import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain'
 import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 
 // 采购退货任务主
 defineOptions({ name: 'PurchasereturnJobMain' })
@@ -238,7 +239,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
-    download.excel(data, '采购退货任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index 1463bf747..e401c8840 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -27,7 +27,7 @@ export const PurchasereturnJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false
+      sortTableDefault: 1
     },
     {
       label: '采购收货记录单号',
@@ -635,6 +635,15 @@ export const PurchasereturnJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        },
       }
     },
     {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 4619a99d0..6765de99b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
 
@@ -140,15 +141,15 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.masterId)
+    handleDocumentPrint(row.id,row.masterId)
   }
 }
 
 // 单据打印
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
-  window.open(documentSrc.value + '&id=' + id)
+const handleDocumentPrint = async (id,masterId) => {
+  window.open(documentSrc.value + '&id=' + id+ '&masterId=' + masterId)
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -170,12 +171,11 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
-    
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index ff8ee85f8..4934ee993 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -28,7 +28,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false
+      sortTableDefault: 1
     },
     {
       label: '任务单号',
@@ -37,7 +37,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false
+
+      sortTableDefault: 1
     },
     {
       label: '采购收货记录单号',
@@ -412,6 +413,15 @@ export const PurchasereturnRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        },
       }
     },
     {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 6c99b8e79..700d90eda 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -139,6 +139,7 @@ import { getAccessToken } from '@/utils/auth'
 import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMain' })
 
@@ -534,31 +535,31 @@ const butttondata = (row, $index) => {
   return [
     defaultButtons.mainListCloseBtn({
       hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),
-      hasPermi: 'wms:purchasereceipt-request-main:close'
+      hasPermi: 'wms:purchasereturn-request-main:close'
     }), // 关闭
     defaultButtons.mainListReAddBtn({
       hide: isShowMainButton(row, ['5']),
-      hasPermi: 'wms:purchasereceipt-request-main:reAdd'
+      hasPermi: 'wms:purchasereturn-request-main:reAdd'
     }), //重新添加
     defaultButtons.mainListSubmitBtn({
       hide: isShowMainButton(row, ['1']),
-      hasPermi: 'wms:purchasereceipt-request-main:submit'
+      hasPermi: 'wms:purchasereturn-request-main:submit'
     }), // 提交审批
     defaultButtons.mainListTurnDownBtn({
       hide: isShowMainButton(row, ['2']),
-      hasPermi: 'wms:purchasereceipt-request-main:refused'
+      hasPermi: 'wms:purchasereturn-request-main:refused'
     }), // 驳回
     defaultButtons.mainListApproveBtn({
       hide: isShowMainButton(row, ['2']),
-      hasPermi: 'wms:purchasereceipt-request-main:agree'
+      hasPermi: 'wms:purchasereturn-request-main:agree'
     }), // 审批通过
     defaultButtons.mainListHandleBtn({
       hide: isShowMainButton(row, ['3']),
-      hasPermi: 'wms:purchasereceipt-request-main:handle'
+      hasPermi: 'wms:purchasereturn-request-main:handle'
     }), // 处理
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
-      hasPermi: 'wms:purchasereceipt-request-main:update'
+      hasPermi: 'wms:purchasereturn-request-main:update'
     }) // 编辑
     // {
     //   label: '生成标签',
@@ -758,7 +759,7 @@ const handleExport = async () => {
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       tableObject.params
     )
-    download.excel(data, '采购退货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -983,7 +984,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购退货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 7752f643d..03fec37ac 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -546,6 +546,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
+      },
+      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')]
+        },
       }
     },
     {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
index 5f5e2b9ed..a2ec773c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
@@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordSpareMain' })
 
@@ -170,10 +171,10 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
-      download.excel(data, `维修备件退货记录主.xlsx`)
+      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     }
     
   } catch {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
index f742061be..52c0fb402 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
@@ -361,6 +361,15 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      },
+    }
   },
   {
     label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index bea529f22..a5de550cc 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -141,6 +141,7 @@ import { getAccessToken } from '@/utils/auth'
 import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestSpareMain' })
 
@@ -708,7 +709,7 @@ const handleExport = async () => {
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
     )
-    download.excel(data, '维修备件退货申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
index 456a626fb..afdb1d58f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
@@ -482,6 +482,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: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')]
+      },
+    }
   },
   {
     label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index c4a0dd4b4..7dee1ed75 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -101,6 +101,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -348,7 +349,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
-    download.excel(data, '上架任务主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 7ccb28ffe..065224b82 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -23,7 +23,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
   },
   {
     label: '供应商代码',
@@ -278,6 +278,15 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
+    },
+    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')]
+      },
     }
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 3d07d9ad2..9aa5e6792 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -91,6 +91,7 @@ import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
 import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 上架记录主
 defineOptions({ name: 'PutawayRecordMain' })
 
@@ -211,7 +212,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
-    download.excel(data, '上架记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 306539cfc..7a0c13fd3 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -23,7 +23,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
   },
   {
     label: '任务单号',
@@ -32,7 +32,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    sortTableDefault: 1,
   },
   {
     label: '供应商代码',
@@ -204,6 +204,15 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
+    },
+    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')]
+      },
     }
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 1223cadad..ad499e129 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -110,6 +110,7 @@ import { PutawayRequestMain,
 import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
 import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import { formatDate } from '@/utils/formatTime'
 
 // 上架申请
 defineOptions({ name: 'PutawayRequestMain' })
@@ -406,7 +407,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
-    download.excel(data, '上架申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -475,7 +476,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上架申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 1e0567b0d..f68e002e1 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -219,6 +219,15 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
+    },
+    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')]
+      },
     }
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index 76e6d66a4..b32591516 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -74,6 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain";
+import { formatDate } from '@/utils/formatTime'
 // 备件收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -259,7 +260,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
-    download.excel(data, '备件收货任务.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 2be57709a..396494053 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -49,7 +49,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
-    sortTableDefault:1,
     table: {
       width: 150
     },
@@ -402,7 +401,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -411,6 +410,15 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '自动完成',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
index f5270ed4f..0682aad0b 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -85,6 +85,7 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
 const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+import { formatDate } from '@/utils/formatTime'
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -160,7 +161,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
-    download.excel(data, '备件收货记录.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index c5f111858..63841eb29 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -366,7 +366,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -375,6 +374,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    }
   },
   {
 
@@ -1032,7 +1040,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTable:false,
     hiddenInMain:true
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 622c5196f..8020ef79d 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -561,7 +561,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
-    download.excel(data, '备件收货申请.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -628,7 +628,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 87959bca3..fd3e60289 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -513,7 +513,16 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 1057b940a..43c77fb2d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -208,13 +208,14 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  try {
-    await getListHead()
-  } catch (error) {
+  // try {
+  //   await getListHead()
+  // } catch (error) {
     
-  }
-  // updateDateTableColumns()
-  getList()
+  // }
+  // // updateDateTableColumns()
+  // getList()
+  seachRef.value.search()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index b094557b3..19632d743 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -109,45 +109,45 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '版本号',
-    field: 'version',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    search: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        multiple: true,
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择版本号', // 输入框占位文本
-        searchField: 'detailVersion', // 查询弹窗赋值字段
-        searchTitle: '版本号', // 查询弹窗标题
-        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
-        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'supplierCodes',
-          value: 'supplierCode',
-          message: '请填写供应商代码！',
-          isMainValue: true,
-          isCSV:true,//是否用逗号分隔参数
-        },{
-          key: 'itemCodes',
-          value: 'itemCode',
-          message: '请填写物料代码！',
-          isMainValue: true,
-          isCSV:true,//是否用逗号分隔参数
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
+  // {
+  //   label: '版本号',
+  //   field: 'version',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch:true,
+  //   search: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       multiple: true,
+  //       enterSearch: true,
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择版本号', // 输入框占位文本
+  //       searchField: 'detailVersion', // 查询弹窗赋值字段
+  //       searchTitle: '版本号', // 查询弹窗标题
+  //       searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+  //       searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'supplierCodes',
+  //         value: 'supplierCode',
+  //         message: '请填写供应商代码！',
+  //         isMainValue: true,
+  //         isCSV:true,//是否用逗号分隔参数
+  //       },{
+  //         key: 'itemCodes',
+  //         value: 'itemCode',
+  //         message: '请填写物料代码！',
+  //         isMainValue: true,
+  //         isCSV:true,//是否用逗号分隔参数
+  //       },{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '到货日期',
     field: 'dueDate',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 9e3dea6c8..d53844f8e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -174,6 +174,7 @@ const buttonBaseClick = async (val, item) => {
 
 
 const searchClick = async (data)=>{
+  data.flag = 1
   console.log('searchClick',data)
   await setSearchParamsHead(data)
   // updateDateTableColumns()
@@ -267,12 +268,14 @@ const readHandle = (row,isAll)=>{
   })
   
 }
+const seachRef = ref()
 
 /** 初始化 **/
 onMounted(async () => {
-  await getListHead()
-  // updateDateTableColumns()
-  getList()
+  // await getListHead()
+  // // updateDateTableColumns()
+  // getList()
+  seachRef.value.search()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index c92a56cf8..f29ccf027 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -276,7 +276,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -295,6 +295,15 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index c34a3ce7b..cfe08ae92 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -395,7 +395,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     isForm: false,
     formatter: dateFormatter,
     detail: {
@@ -413,7 +413,16 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
-    }
+    },
+    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')]
+      }
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 3794079fb..d9b4fa50e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -302,6 +302,15 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    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')]
+      }
+    },
   },
   {
     label: '创建者',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 5dca54016..9dc9bf340 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -511,10 +511,11 @@ const butttondata = (row, $index) => {
     return []
   }
   return [
-    defaultButtons.mainListPurchasePlanOpeBtn({
-      hide: isShowMainButton(row, ['5']),
-      hasPermi: 'wms:supplierdeliver-request-main:open'
-    }), // 打开
+    //202408111354需求变更供应商发货申请关闭后不能打开 去掉打开按钮
+    // defaultButtons.mainListPurchasePlanOpeBtn({
+    //   hide: isShowMainButton(row, ['5']),
+    //   hasPermi: 'wms:supplierdeliver-request-main:open'
+    // }), // 打开 
     defaultButtons.mainListPlanUploadQualityReportBtn({
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index df286c9f7..f4e859a1e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -571,11 +571,11 @@ const blurOne = (oneRow, twoRow) => {
 }
 //在托下方的箱数量失去焦点
 const blurTwo = (oneRow, twoRow, threeRow) => {
-  // if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-  //   message.warning('数量最多为' + oneRow.packQty)
-  //   threeRow.qtyTwo = oneRow.packQty
-  //   return
-  // }
+  if (parseFloat(threeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('数量最多为' + oneRow.packQty)
+    threeRow.qtyTwo = oneRow.packQty
+    return
+  }
   let num = 0
   twoRow.children.forEach((item) => {
     num = accuracyFun.add(parseFloat(num), parseFloat(item.qtyTwo))
@@ -584,10 +584,10 @@ const blurTwo = (oneRow, twoRow, threeRow) => {
 }
 // 箱数量失去焦点
 const blurThree = (oneRow, twoRow, thereeRow) => {
-  // if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
-  //   message.warning('每箱个数最多' + oneRow.packQty)
-  //   thereeRow.qtyTwo = oneRow.packQty
-  // }
+  if (parseFloat(thereeRow.qtyTwo) > parseFloat(oneRow.packQty)) {
+    message.warning('每箱个数最多' + oneRow.packQty)
+    thereeRow.qtyTwo = oneRow.packQty
+  }
   let num = 0
   twoRow.children.forEach((item) => {
     num = accuracyFun.add(parseFloat(num), parseFloat(item.qtyTwo))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 154d21323..ee1d15355 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -328,7 +328,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    isTable:false,
+    isTable:true,
     table: {
       width: 180
     },
@@ -341,6 +341,15 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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
   },
   {
@@ -678,13 +687,13 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
@@ -1246,11 +1255,11 @@ const validateBatch = (rule: any, value: any, callback: any) => {
 
 const validateQty = (rule: any, value: any, callback: any,a,b) => {
   console.log('validateQty',rule, value,a,b)
-  // if (!reg.test(value)) {
-  //     callback(new Error('英文字母、数字或下划线'));
-  // } else {
+  if (!value) {
+      callback(new Error('发货数量必须大于0'));
+  } else {
       callback();
-  // }
+  }
 }  
 //表单校验
 export const SupplierdeliverRequestDetailRules = reactive({
@@ -1258,8 +1267,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   //   { required: true, message: '请输入包装号', trigger: 'blur' }
   // ],
   qty:[
-    { required: true, message: '请输入发货数量1', trigger: 'change' },
-    // { validator: validateQty, trigger: 'change' },
+    { required: true, message: '请输入发货数量', trigger: 'change' },
+    { validator: validateQty, trigger: 'change' },
   ],
   supplierBatch: [
     { required: true, message: '请输入供应商批次', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
index f3342060f..6784b9653 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -68,6 +68,7 @@ import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain'
 import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+  import { formatDate } from '@/utils/formatTime'
 // 采购索赔记录主
 defineOptions({ name: 'PurchaseclaimRecordMain' })
 
@@ -156,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
-    download.excel(data, '采购索赔记录主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
index 8f7081db4..8da8759d7 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
@@ -340,7 +340,16 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    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')]
+      },
+    },
   },
 ]))
 
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index d95021822..3b4377640 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -77,6 +77,7 @@
   import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+  import { formatDate } from '@/utils/formatTime'
 
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })
@@ -414,7 +415,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
-      download.excel(data, '采购索赔申请主.xlsx')
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -484,7 +485,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '采购索赔申请信息导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
   })
   // 导入成功之后
   const importSuccess = () => {
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 6eac7f740..d5d984b84 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -288,7 +288,16 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 180
-    }
+    },
+    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')]
+      },
+    },
   },
   {
     label: '最后更新者',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index e604edbb3..db483a11b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -24,7 +24,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
     sortSearchDefault:1,
-    sortTableDefault:99999,
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -601,6 +601,31 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isDetail: false,
+    isTableForm: false,
+    isTable: true,
+    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')]
+      }
+    },
+  },
   {
     label: '供应商创建时间',
     field: 'requestTime',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 7de01044e..73aa8bb5f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -724,6 +724,31 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:1001,
     isForm: false,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isDetail: false,
+    isTableForm: false,
+    isTable: true,
+    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')]
+      }
+    },
+  },
   {
     label: '供应商创建时间',
     field: 'requestTime',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index ccc246623..14e4877d6 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -716,6 +716,31 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:1001,
     isForm: false,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isDetail: false,
+    isTableForm: false,
+    isTable: true,
+    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')]
+      }
+    },
+  },
   {
     label: '差价范围',
     field: 'cha',
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index 8c4a9e4dd..a99de5e62 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -205,14 +205,6 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     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')]
-      }
-    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -226,6 +218,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: 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')]
+      }
+    },
   },
   {
     label: '备注',