diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts
index 7b4ea2ef6..f1e245047 100644
--- a/src/api/qms/inspectionQ2/index.ts
+++ b/src/api/qms/inspectionQ2/index.ts
@@ -76,3 +76,8 @@ export const importTemplate = () => {
 export const finishQ2 = async (id: number) => {
   return await request.get({ url: `/qms/inspectionQ2/finish?id=` + id })
 }
+
+// 获取系统中的email地址
+export const getEmail = () => {
+  return request.get({ url: `/qms/inspectionQ2/getEmail`})
+}
diff --git a/src/api/qms/sampleCode/index.ts b/src/api/qms/sampleCode/index.ts
index a0d1f70cb..871035867 100644
--- a/src/api/qms/sampleCode/index.ts
+++ b/src/api/qms/sampleCode/index.ts
@@ -49,9 +49,10 @@ export const deleteSampleCode = async (id: number) => {
 // 导出样本字码 Excel
 export const exportSampleCode = async (params) => {
   if (params.isSearch) {
+    delete params.isSearch
     const data = {...params}
-    return await request.downloadPost({ url: `/qms/sample-code/export-excel-senior`, data })
-  }else{
+    return request.downloadPost({ url: '/qms/sample-code/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/qms/sample-code/export-excel`, params })
   }
 }
diff --git a/src/api/qms/samplingScheme/index.ts b/src/api/qms/samplingScheme/index.ts
index 32ec93a07..8512eeaec 100644
--- a/src/api/qms/samplingScheme/index.ts
+++ b/src/api/qms/samplingScheme/index.ts
@@ -41,9 +41,10 @@ export const deleteSamplingScheme = async (id: number) => {
 // 导出采样方案 Excel
 export const exportSamplingScheme = async (params) => {
   if (params.isSearch) {
+    delete params.isSearch
     const data = {...params}
-    return await request.downloadPost({ url: `/qms/sampling-scheme/export-excel-senior`, data })
-  }else{
+    return request.downloadPost({ url: '/qms/sampling-scheme/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/qms/sampling-scheme/export-excel`, params })
   }
 }
diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts
index 2a3e2bb07..8554c5550 100644
--- a/src/api/wms/areabasic/index.ts
+++ b/src/api/wms/areabasic/index.ts
@@ -32,6 +32,10 @@ export const selectAreabasicDOByCode = async (locationCode: String) => {
 export const getAreaList = async (params) => {
   return await request.get({ url: `/wms/areabasic/list`, params })
 }
+// 校验库区
+export const verifyAreaList = async (params) => {
+  return await request.get({ url: `/wms/areabasic/listAreabasicByCode`, params })
+}
 // 查询库区详情
 export const getArea = async (id: number) => {
   return await request.get({ url: `/wms/areabasic/get?id=` + id })
diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index bce556d5c..df0ef46bb 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -34,7 +34,10 @@ export const getLocationPage = async (params) => {
     return await request.get({ url: `/wms/location/page`, params })
   }
 }
-
+// 校验库位
+export const verifyLocation = async (params) => {
+  return await request.get({ url: `/wms/location/listLocationByCode`, params })
+}
 export const getLocationMPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
diff --git a/src/api/wms/locationgroup/index.ts b/src/api/wms/locationgroup/index.ts
index 1aed8bb72..7e84e6c05 100644
--- a/src/api/wms/locationgroup/index.ts
+++ b/src/api/wms/locationgroup/index.ts
@@ -22,6 +22,10 @@ export const getLocationgroupPage = async (params) => {
     return await request.get({ url: `/wms/locationgroup/page`, params })
   }
 }
+// 校验库位组
+export const verifyLocationgroup = async (params) => {
+  return await request.get({ url: `/wms/locationgroup/ListByCode`, params })
+}
 // 查询库位组列表
 export const getLocationgroupList = async (params) => {
   return await request.get({ url: `/wms/locationgroup/list`, params })
diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 64a9fbf06..8854a8b3d 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -101,6 +101,12 @@ export const batchPrintingLable = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLable`, data })
 }
 
+
+// 批量打印标签多选
+export const batchPrintingLables = async (data: any) => {
+  return await request.post({ url: `/wms/package/batchPrintingLables`, data })
+}
+
 // 打印标签获取包装列表
 export const getLabel = async (id: number) => {
   return await request.get({ url: `/wms/package/getLabel?id=` + id })
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index d7637d4d0..29a791d91 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -25,6 +25,7 @@ export interface ProductreceiptRecordMainVO {
   toAreaTypes: string
   toAreaCodes: string
   available: string
+  inventoryStatus:string
 }
 
 // 查询制品收货记录主列表
diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts
index bbbddcbd9..8e90c034c 100644
--- a/src/api/wms/productredressJobMain/index.ts
+++ b/src/api/wms/productredressJobMain/index.ts
@@ -90,10 +90,15 @@ export const abandonProductredressJobMain = async (id: number) => {
 
 // 导出制品回收任务主 Excel
 export const exportProductredressJobMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-job-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productredress-job-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productredress-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productredress-job-main/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/purchaseMainWms/index.ts b/src/api/wms/purchaseMainWms/index.ts
new file mode 100644
index 000000000..97ca9ed2d
--- /dev/null
+++ b/src/api/wms/purchaseMainWms/index.ts
@@ -0,0 +1,86 @@
+import request from '@/config/axios'
+
+export interface PurchaseMainVO {
+  supplierCode: string
+  number: string
+  type: string
+  status: string
+  orderDate: Date
+  dueDate: Date
+  version: string
+  taxRate: number
+  contactName: string
+  contactPhone: string
+  contactEmail: string
+  isConsignment: string
+  businessType: string
+  remark: string
+  createTime: Date
+  creator: string
+  updateTime: Date
+  updater: string
+  currentStage: number
+  available: string
+}
+
+// 查询采购订单主列表
+export const getPurchaseMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-main/seniorWMS', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-main/pageWMS`, params })
+  }
+}
+
+// 查询采购订单主详情
+export const getPurchaseMain = async (id: number) => {
+  return await request.get({ url: `/wms/purchase-main/get?id=` + id })
+}
+
+// 新增采购订单主
+export const createPurchaseMain = async (data: PurchaseMainVO) => {
+  return await request.post({ url: `/wms/purchase-main/create`, data })
+}
+
+// 修改采购订单主
+export const updatePurchaseMain = async (data: PurchaseMainVO) => {
+  return await request.put({ url: `/wms/purchase-main/update`, data })
+}
+
+// 删除采购订单主
+export const deletePurchaseMain = async (id: number) => {
+  return await request.delete({ url: `/wms/purchase-main/delete?id=` + id })
+}
+
+// 关闭采购订单主
+export const closePurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/close?id=` + id })
+}
+// 打开采购订单主
+export const openPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/open?id=` + id })
+}
+// 发布采购订单主
+export const publishPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/publish?id=` + id })
+}
+// 下架采购订单主
+export const witPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/wit?id=` + id })
+}
+// 导出采购订单主 Excel
+export const exportPurchaseMain = async (params) => {
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({ url: `/wms/purchase-main/export-excel-seniorWMS`, data })
+  } else {
+    return await request.download({ url: `/wms/purchase-main/export-excelWMS`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchase-main/get-import-template' })
+}
diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index 4dc9271e7..53d6cec7d 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -45,52 +45,49 @@ export interface PurchasereceiptRecordDetailVO {
   interfaceType: string
   fromOwnerCode: string
   toOwnerCode: string
-  toBatch: string,
-  parentPackingNumber:string
-  packingNumber:string
+  toBatch: string
+  parentPackingNumber: string
+  packingNumber: string
 }
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchasereceipt-record-detail/senior', data })
   } else {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
   }
 }
 
-
 // 查询采购拒收记录
 export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorRefuse', data })
   } else {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/pageRefuse`, params })
   }
 }
 
-
 // 查询备件收货记录子列表
 export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorSpare', data })
   } else {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/pageSpare`, params })
   }
 }
 
-
 // 查询采购收货记录--退货筛选列表
 export const getPurchasereceiptRecordDetailPageReturn = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorReturn', data })
   } else {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/pageReturn`, params })
@@ -100,7 +97,7 @@ export const getPurchasereceiptRecordDetailPageReturn = async (params) => {
 export const getPurchasereceiptRecordDetailPageSCP = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorSCP', data })
   } else {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/pageSCP`, params })
@@ -111,21 +108,30 @@ export const getPurchasereceiptRecordDetailPageSCP = async (params) => {
 export const getPurchasereceiptRecordDetailPageBySupplierCode = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorBySupplierCode', data })
+    const data = { ...params }
+    return await request.post({
+      url: '/wms/purchasereceipt-record-detail/seniorBySupplierCode',
+      data
+    })
   } else {
-    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageBySupplierCode`, params })
+    return await request.get({
+      url: `/wms/purchasereceipt-record-detail/pageBySupplierCode`,
+      params
+    })
   }
 }
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailList = async (params) => {
-    return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params })
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params })
 }
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeatPurchaseReceipt`, params })
+  return await request.get({
+    url: `/wms/purchasereceipt-record-detail/listToRepeatPurchaseReceipt`,
+    params
+  })
 }
 
 // 查询采购收货记录子详情
@@ -161,7 +167,7 @@ export const importTemplate = () => {
 export const getScarceGoodsDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return await request.post({ url: '/wms/purchaseshortage-detail/senior', data })
   } else {
     return await request.get({ url: `/wms/purchaseshortage-detail/page`, params })
@@ -170,10 +176,19 @@ export const getScarceGoodsDetailPage = async (params) => {
 
 // 查询采购收货记录子包装数据
 export const queryPurchaseceiptChildPackingNumber = async (params) => {
-  return await request.get({ url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`, params })
+  return await request.get({
+    url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`,
+    params
+  })
 }
 
 // 查询采购收货缺货记录子包装数据
 export const queryPurchaseshortageChildPackingNumber = async (params) => {
   return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params })
 }
+
+// 查询采购收货缺货记录子包装数据
+export const pageForQ2 = async (params) => {
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/pageForQ2`, params })
+}
+
diff --git a/src/api/wms/transactiontype/index.ts b/src/api/wms/transactiontype/index.ts
index 56d65f367..8b30d08dc 100644
--- a/src/api/wms/transactiontype/index.ts
+++ b/src/api/wms/transactiontype/index.ts
@@ -24,6 +24,12 @@ export const getTransactiontypePage = async (params) => {
   }
 }
 
+// 校验事务类型列表
+export const verifyTransactiontype = async (params) => {
+  return await request.get({ url: `/wms/transactiontype/ListByCode`, params })
+}
+
+
 // 查询事务类型详情
 export const getTransactiontype = async (id: number) => {
   return await request.get({ url: `/wms/transactiontype/get?id=` + id })
diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
index 6c0e25b15..51e6eb71e 100644
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@@ -21,6 +21,13 @@ export const getWarehousePage = async (params) => {
     return await request.get({ url: `/wms/warehouse/page`, params })
   }
 }
+
+// 校验仓库
+export const verifyWarehouse = async (params) => {
+  return await request.get({ url: `/wms/warehouse/ListByCode`, params })
+}
+
+
 // 查询仓库所有列表
 export const getWarehouseList = async (params) => {
   return await request.get({ url: `/wms/warehouse/list`, params })
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 1a9076d65..33db690db 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
+  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onSubmit', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -196,6 +196,10 @@ export default defineComponent({
     const onChange = (field, cur) => {
       emit('onChange', field, cur)
     }
+    const onSubmit = (event) => {
+      emit('onSubmit', event)
+    }
+    
     /**
      * 监听失去焦点
      * @param field 当前操作字段
@@ -461,6 +465,7 @@ export default defineComponent({
         class={prefixCls}
         v-loading={props.vLoading}
         label-position={props.labelPosition}
+        onSubmit={(e)=>{onSubmit(e)}}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index f75d6fa2f..deea2f7a7 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -122,7 +122,12 @@ const onInput = (field,value) => {
 const onChange = (field, value)=>{
   emit('onChange', field,value)
 }
+
+const onSubmit = (e) => {
+  e.preventDefault();
+}
 const onEnter = async (field, value, e) => {
+  
   if(props.enterSearch){
     search()
   }else{
@@ -183,6 +188,7 @@ const opensearchTable = (
             return
           }
         }
+
       }else if(searchCondition[i].isTableRowValue){
         if(searchCondition[i].required){
           if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
@@ -305,6 +311,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
       @opensearchTable="opensearchTable"
       @onChange="onChange"
       @onEnter="onEnter"
+      @onSubmit="onSubmit"
     >
       <template #action>
         <div v-if="layout === 'inline'">
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 728fbd500..62eb8ae89 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -23,11 +23,30 @@
           <!-- 数字输入框 -->
           <el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="getInputPrecision(item.column)"  :disabled="item.disabled"/>
           <!-- 下拉框 -->
-          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" :placeholder="t('ts.请选择内容')" :filterable="getFilterable(item.column)" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
+          <el-select v-else-if="getInputType(item.column) == 'select' && !getFilterable(item.column)" v-model="item.value1" :placeholder="t('ts.请选择内容')" :filterable="!getFilterable(item.column)" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
             <el-option v-for="dict in allDictOptions[item.column]" :key="dict.value" :label="t(`ts.${dict.label}`).replace('ts.','')"
             :value="dict.value" />
-            <!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label"
-              :value="op[item.optionsValue] || op.value" :key="index" /> -->
+          </el-select>
+          <el-select
+            v-else-if="getInputType(item.column) == 'select' && getFilterable(item.column)"
+            v-model="item.value1"
+            :multiple="item.action == 'in' || item.action == 'notIn' ? true : false"
+            collapse-tags
+            collapse-tags-tooltip
+            filterable
+            remote
+            reserve-keyword
+            :placeholder="t('ts.请选择内容')"
+            remote-show-suffix
+            :remote-method="remoteMethod"
+            :loading="loading"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
           <!-- 时间 -->
           <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" :start-placeholder="t('ts.开始时间')" :end-placeholder="t('ts.结束时间')" v-model="item.value1"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
@@ -68,6 +87,12 @@ UserApi.getUserListAll().then((res) => {
       value: item.id
     }
   })
+  options.value = res.map((item) => {
+    return {
+      label: item.nickname,
+      value: item.id
+    }
+  })
 })
 
 const props = defineProps({
@@ -171,9 +196,9 @@ const getFilterable = (val) => {
   const type = searchOption_high.value.find(item => (item.field == val))
   // 下拉列表过长，去掉筛选功能
   if (type?.field == 'creator' || type?.field == 'updater' || type?.field == 'worker') {
-    return false
-  }else{
     return true
+  }else{
+    return false
   }
 }
  // 判断数字输入框小数点位数
@@ -330,6 +355,21 @@ const changeDateTimePicker = (e, val,from) =>{
     val.value = e.join(',')
   }
 }
+const loading = ref(false)
+const options = ref([])
+const remoteMethod = (query, array) => {
+  if (query) {
+    loading.value = true
+    setTimeout(() => {
+      loading.value = false
+      options.value = userListAll.value.filter((item) => {
+        return item.label.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  } else {
+    options.value = userListAll.value
+  }
+}
 
 defineExpose({
   popoverVisible
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 2dd84a162..b32d0d271 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -200,11 +200,11 @@ const searchFormClick = (searchData) => {
   // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters
   // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
   if (searchData.filters) {
-    if (searchConditionRef.value.filters) {
+    if (searchConditionRef.value&&searchConditionRef.value.filters) {
       Object.keys(searchConditionRef.value.filters).forEach((key) => {
         searchData.filters.push(searchConditionRef.value.filters[key])
       })
-    } else {
+    } else if(searchConditionRef.value){
       Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
           action: '==',
@@ -216,7 +216,7 @@ const searchFormClick = (searchData) => {
   } else {
     if (searchConditionRef.value.filters) {
       searchData.filters = searchConditionRef.value.filters
-    } else {
+    } else if(searchConditionRef.value){
       searchData.filters = []
       Object.keys(searchConditionRef.value).forEach((key) => {
         searchData.filters.push({
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index dc2d547ea..b05f796e8 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1280,8 +1280,9 @@ export default {
     规则配置:'Rule configuration',
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
-    '确认撤销报工吗？':'Are you sure to cancel the job application?',
-
+    '确认撤销报工吗？': 'Are you sure to cancel the job application?',
+    '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity',
+    撤销报工成功:'Revocation of work report successful',
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 0578b60b5..b3ff50bd3 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1277,7 +1277,9 @@ export default {
     规则配置:'规则配置',
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
-    '确认撤销报工吗？':"确认撤销报工吗？",
+    '确认撤销报工吗？': "确认撤销报工吗？",
+    '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量',
+    撤销报工成功:'撤销报工成功',
   },
 
 }
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 11aca3804..800462d54 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -329,6 +329,7 @@ export enum DICT_TYPE {
   DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置
   DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型
   PROBLEM_REASON = 'problem_reason', // 质量通知问题原因
+  QMS_CLAIM_MULTIPLE = 'qms_claim_multiple',  //质量通知索赔倍数
 
   // ========== 业务 - mes -gaojs ==========
   QUALIFY_STATUS = 'qualify_status', //质检状态
@@ -401,4 +402,5 @@ export enum DICT_TYPE {
  PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
   PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态
   RETURN_REASON_TYPE = 'return_reason_type',  // 采购退货原因类型
+  SCRAPPING_REASON = 'scrapping_reason',  //制品子件报废原因
 }
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index cf8050651..5fe8852ca 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1054,6 +1054,17 @@ export function mainListPointBtn(option: any) {
     hasPermi: ''
   })
 }
+export function mainListPrintInspectionBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.打印检验指引单`).replace('ts.', ''),
+    name: 'printInspection',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-回收
 export function mainListRecoveryBtn(option: any) {
   return __defaultBtnOption(option, {
diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue
index 7cff87de1..b222e423b 100644
--- a/src/views/eam/SparePartsOutLocationRecord/index.vue
+++ b/src/views/eam/SparePartsOutLocationRecord/index.vue
@@ -101,7 +101,8 @@ import * as SparePartsOutLocationRecordDetailApi from '@/api/eam/sparePartsOutLo
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'SparePartsOutLocationRecord' })
 
@@ -258,18 +259,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleMainExport = async (id: number) => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(id)
     download.excel(data, '盘点工单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -292,14 +292,14 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(
       tableObject.params
     )
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/adjustRecord/index.vue b/src/views/eam/adjustRecord/index.vue
index e144d3276..bd52a273f 100644
--- a/src/views/eam/adjustRecord/index.vue
+++ b/src/views/eam/adjustRecord/index.vue
@@ -59,6 +59,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
 
   // 采购订单
   defineOptions({ name: 'AdjustRecord' })
@@ -207,18 +209,17 @@
   }
   
   /** 列表导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleMainExport = async (id : number) => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await AdjustRecordMainApi.exportAdjustRecordMain(id)
       download.excel(data, '盘点工单.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
   
@@ -242,12 +243,12 @@
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await AdjustRecordMainApi.exportAdjustRecordMain(tableObject.params)
       download.excel(data, '备件申领记录主.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/applicationRecord/index.vue b/src/views/eam/applicationRecord/index.vue
index 236597418..b378aa323 100644
--- a/src/views/eam/applicationRecord/index.vue
+++ b/src/views/eam/applicationRecord/index.vue
@@ -113,6 +113,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 approveDetail from '@/components/Detail/src/approveDetail.vue'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 // 采购订单
 defineOptions({ name: 'ApplicationRecord' })
@@ -280,18 +282,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ApplicationRecordMainApi.exportApplicationRecordMain(tableObject.params)
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicEamProductionline/index.vue b/src/views/eam/basicEamProductionline/index.vue
index 38b483ed9..f4f90e6db 100644
--- a/src/views/eam/basicEamProductionline/index.vue
+++ b/src/views/eam/basicEamProductionline/index.vue
@@ -66,7 +66,8 @@ 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 BasicEamWorkshopApi from "@/api/eam/basicEamWorkshop";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicEamProductionline' })
 
 const message = useMessage() // 消息弹窗
@@ -261,18 +262,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicEamProductionlineApi.exportBasicEamProductionline(tableObject.params)
     download.excel(data, '生产线.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicEamWorkshop/index.vue b/src/views/eam/basicEamWorkshop/index.vue
index 5f9f85977..20689c65f 100644
--- a/src/views/eam/basicEamWorkshop/index.vue
+++ b/src/views/eam/basicEamWorkshop/index.vue
@@ -66,7 +66,8 @@ 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 BasicFaultCauseApi from "@/api/eam/basicFaultCause";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicEamWorkshop' })
 
 const message = useMessage() // 消息弹窗
@@ -260,18 +261,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicEamWorkshopApi.exportBasicEamWorkshop(tableObject.params)
     download.excel(data, 'EAM车间.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicFaultCause/index.vue b/src/views/eam/basicFaultCause/index.vue
index b2157ca64..05904df94 100644
--- a/src/views/eam/basicFaultCause/index.vue
+++ b/src/views/eam/basicFaultCause/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicFaultCause' })
 
 const message = useMessage() // 消息弹窗
@@ -243,18 +244,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicFaultCauseApi.exportBasicFaultCause(tableObject.params)
     download.excel(data, '故障原因.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicFaultType/index.vue b/src/views/eam/basicFaultType/index.vue
index 8296e6fa9..7708345a9 100644
--- a/src/views/eam/basicFaultType/index.vue
+++ b/src/views/eam/basicFaultType/index.vue
@@ -66,7 +66,8 @@ 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 BasicInspectionOptionApi from "@/api/eam/basicInspectionOption";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicFaultType' })
 
 const message = useMessage() // 消息弹窗
@@ -244,18 +245,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await BasicFaultTypeApi.exportBasicFaultType(tableObject.params)
     download.excel(data, '故障类型.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicInspectionOption/index.vue b/src/views/eam/basicInspectionOption/index.vue
index e99246247..ee06a61f3 100644
--- a/src/views/eam/basicInspectionOption/index.vue
+++ b/src/views/eam/basicInspectionOption/index.vue
@@ -67,7 +67,8 @@ 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 ItemForm from "@/views/eam/basicInspectionOption/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicInspectionOption' })
 
 const message = useMessage() // 消息弹窗
@@ -262,18 +263,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await BasicInspectionOptionApi.exportBasicInspectionOption(tableObject.params)
     download.excel(data, '巡检方案.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicMaintenanceOption/index.vue b/src/views/eam/basicMaintenanceOption/index.vue
index 533e2f1f2..4efbf9318 100644
--- a/src/views/eam/basicMaintenanceOption/index.vue
+++ b/src/views/eam/basicMaintenanceOption/index.vue
@@ -67,7 +67,8 @@ 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 ItemForm from "@/views/eam/basicMaintenanceOption/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicMaintenanceOption' })
 
 const message = useMessage() // 消息弹窗
@@ -263,18 +264,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicMaintenanceOptionApi.exportBasicMaintenanceOption(tableObject.params)
     download.excel(data, '保养方案.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/basicSpotCheckOption/index.vue b/src/views/eam/basicSpotCheckOption/index.vue
index b4bd13352..e6e7e2ca1 100644
--- a/src/views/eam/basicSpotCheckOption/index.vue
+++ b/src/views/eam/basicSpotCheckOption/index.vue
@@ -67,7 +67,8 @@ 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 ItemForm from "@/views/eam/basicSpotCheckOption/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicSpotCheckOption' })
 
 const message = useMessage() // 消息弹窗
@@ -253,18 +254,17 @@ const getData = async() => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicSpotCheckOptionApi.exportBasicSpotCheckOption(tableObject.params)
     download.excel(data, '点检方案.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/classTypeRole/index.vue b/src/views/eam/classTypeRole/index.vue
index 8ac96d67b..de046605b 100644
--- a/src/views/eam/classTypeRole/index.vue
+++ b/src/views/eam/classTypeRole/index.vue
@@ -70,7 +70,8 @@ import { Role } from '@/views/system/role/role.data'
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 import * as InspectionItemSelectSetApi from "@/api/eam/inspectionItemSelectSet";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ClassTypeRole' })
 
@@ -264,18 +265,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await ClassTypeRoleApi.exportClassTypeRole(tableObject.params)
     download.excel(data, '厂区班组角色维护.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/countRecord/index.vue b/src/views/eam/countRecord/index.vue
index b8a269b1b..b9302acde 100644
--- a/src/views/eam/countRecord/index.vue
+++ b/src/views/eam/countRecord/index.vue
@@ -59,7 +59,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
   // 采购订单
   defineOptions({ name: 'CountRecord' })
 
@@ -224,18 +225,17 @@
   
   
   /** 列表导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleMainExport = async (id : number) => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await CountRecordMainApi.handleMainExport(id)
       download.excel(data, '盘点工单.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
   
@@ -259,12 +259,12 @@
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await CountRecordMainApi.exportCountRecordMain(tableObject.params)
       download.excel(data, '备件申领记录主.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/countadjustPlan/index.vue b/src/views/eam/countadjustPlan/index.vue
index efa6eb661..c4b9b5e8f 100644
--- a/src/views/eam/countadjustPlan/index.vue
+++ b/src/views/eam/countadjustPlan/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'CountadjustPlan' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await CountadjustPlanApi.exportCountadjustPlan(tableObject.params)
     download.excel(data, '备件盘点计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/countadjustWork/index.vue b/src/views/eam/countadjustWork/index.vue
index 43cda52ff..edbe2f679 100644
--- a/src/views/eam/countadjustWork/index.vue
+++ b/src/views/eam/countadjustWork/index.vue
@@ -101,7 +101,8 @@ import * as CountJobDetailApi from '@/api/eam/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'CountadjustWork' })
 
@@ -259,18 +260,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleMainExport = async (id: number) => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await CountJobMainApi.handleMainExport(id)
     download.excel(data, '盘点工单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -280,12 +280,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/documentType/index.vue b/src/views/eam/documentType/index.vue
index 83df2ab37..4a7226a71 100644
--- a/src/views/eam/documentType/index.vue
+++ b/src/views/eam/documentType/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'DocumentType' })
 
 const message = useMessage() // 消息弹窗
@@ -212,18 +213,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await DocumentTypeApi.exportDocumentType(tableObject.params)
     download.excel(data, '文档类型.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/documentTypeSelectSet/index.vue b/src/views/eam/documentTypeSelectSet/index.vue
index 83677d5b9..f0c5c0f1d 100644
--- a/src/views/eam/documentTypeSelectSet/index.vue
+++ b/src/views/eam/documentTypeSelectSet/index.vue
@@ -69,7 +69,8 @@ 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 ItemForm from "@/views/eam/documentTypeSelectSet/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'DocumentTypeSelectSet' })
 
 const message = useMessage() // 消息弹窗
@@ -252,18 +253,17 @@ const handleDisable = async (id: number) => {
 
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await DocumentTypeSelectSetApi.exportDocumentTypeSelectSet(tableObject.params)
     download.excel(data, '文档类型选择集.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index f41b4f823..c7caba7ff 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -114,7 +114,8 @@ import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 import * as UserApi from '@/api/system/user'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentAccounts' })
 
@@ -340,18 +341,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentAccountsApi.exportEquipmentAccounts(tableObject.params)
     download.excel(data, '设备台账.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentInspectionDetail/index.vue b/src/views/eam/equipmentInspectionDetail/index.vue
index b90cb77e2..c72492ef0 100644
--- a/src/views/eam/equipmentInspectionDetail/index.vue
+++ b/src/views/eam/equipmentInspectionDetail/index.vue
@@ -65,6 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentInspectionDetail' })
 
@@ -196,18 +198,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentInspectionDetailApi.exportEquipmentInspectionDetail(tableObject.params)
     download.excel(data, '巡检工单子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentInspectionMain/index.vue b/src/views/eam/equipmentInspectionMain/index.vue
index 13573deec..60d116355 100644
--- a/src/views/eam/equipmentInspectionMain/index.vue
+++ b/src/views/eam/equipmentInspectionMain/index.vue
@@ -95,7 +95,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import * as EquipmentSpotCheckMainApi from "@/api/eam/equipmentSpotCheckMain";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentInspectionMain' })
 
@@ -502,18 +503,17 @@ const getData2=(val)=> {
 
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentInspectionMainApi.exportEquipmentInspectionMain(tableObject.params)
     download.excel(data, '巡检工单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentInspectionRecordDetail/index.vue b/src/views/eam/equipmentInspectionRecordDetail/index.vue
index e188d70d4..61e5e42a6 100644
--- a/src/views/eam/equipmentInspectionRecordDetail/index.vue
+++ b/src/views/eam/equipmentInspectionRecordDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentInspectionRecordDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentInspectionRecordDetailApi.exportEquipmentInspectionRecordDetail(tableObject.params)
     download.excel(data, '巡检记录子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentInspectionRecordMain/index.vue b/src/views/eam/equipmentInspectionRecordMain/index.vue
index cb5ac2ab6..ea1b47451 100644
--- a/src/views/eam/equipmentInspectionRecordMain/index.vue
+++ b/src/views/eam/equipmentInspectionRecordMain/index.vue
@@ -76,7 +76,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentInspectionRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -207,18 +208,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentInspectionRecordMainApi.exportEquipmentInspectionRecordMain(tableObject.params)
     download.excel(data, '巡检记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentMainPart/index.vue b/src/views/eam/equipmentMainPart/index.vue
index 6af6d2835..5c0d507a9 100644
--- a/src/views/eam/equipmentMainPart/index.vue
+++ b/src/views/eam/equipmentMainPart/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentMainPart' })
 
 const message = useMessage() // 消息弹窗
@@ -246,18 +247,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentMainPartApi.exportEquipmentMainPart(tableObject.params)
     download.excel(data, '主要部件.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 4c13406f2..bacf1906a 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -105,7 +105,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import * as EquipmentInspectionMainApi from "@/api/eam/equipmentInspectionMain";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentMaintenanceMain' })
 
 const message = useMessage() // 消息弹窗
@@ -497,18 +498,18 @@ const onChange = (field, item) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentMaintenanceMainApi.exportEquipmentMaintenanceMain(tableObject.params)
     download.excel(data, '设备保养工单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentMaintenanceRecordDetail/index.vue b/src/views/eam/equipmentMaintenanceRecordDetail/index.vue
index 87a9e8567..ba1174787 100644
--- a/src/views/eam/equipmentMaintenanceRecordDetail/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentMaintenanceRecordDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentMaintenanceRecordDetailApi.exportEquipmentMaintenanceRecordDetail(tableObject.params)
     download.excel(data, '保养记录子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 230d20ae4..49ef347cd 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -89,7 +89,8 @@ 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 {maintainExperienceBtn} from "@/utils/disposition/defaultButtons";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentMaintenanceRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -252,18 +253,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentMaintenanceRecordMainApi.exportEquipmentMaintenanceRecordMain(tableObject.params)
     download.excel(data, '设备保养记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentManufacturer/index.vue b/src/views/eam/equipmentManufacturer/index.vue
index 9db5fb151..ee6d8ab63 100644
--- a/src/views/eam/equipmentManufacturer/index.vue
+++ b/src/views/eam/equipmentManufacturer/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentManufacturer' })
 
 const message = useMessage() // 消息弹窗
@@ -212,18 +213,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentManufacturerApi.exportEquipmentManufacturer(tableObject.params)
     download.excel(data, '设备制造商.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentRepairJobDetail/index.vue b/src/views/eam/equipmentRepairJobDetail/index.vue
index bdfae4458..4f2733ae5 100644
--- a/src/views/eam/equipmentRepairJobDetail/index.vue
+++ b/src/views/eam/equipmentRepairJobDetail/index.vue
@@ -65,6 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentRepairJobDetail' })
 
@@ -196,18 +198,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentRepairJobDetailApi.exportEquipmentRepairJobDetail(tableObject.params)
     download.excel(data, '维修工单子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index f8746d3d6..ec5018162 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -96,7 +96,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import {mainListCancelBtn} from "@/utils/disposition/defaultButtons";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentRepairJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -578,18 +579,18 @@ const onChange = (field, item) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentRepairJobMainApi.exportEquipmentRepairJobMain(tableObject.params)
     download.excel(data, '维修工单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentRepairRecordDetail/index.vue b/src/views/eam/equipmentRepairRecordDetail/index.vue
index 3c55b1ec7..56f4ec050 100644
--- a/src/views/eam/equipmentRepairRecordDetail/index.vue
+++ b/src/views/eam/equipmentRepairRecordDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentRepairRecordDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentRepairRecordDetailApi.exportEquipmentRepairRecordDetail(tableObject.params)
     download.excel(data, '设备维修记录子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index 981a8f384..b7ca3b3fc 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -104,7 +104,8 @@ 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 {repairExperienceBtn} from "@/utils/disposition/defaultButtons";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentRepairRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -278,20 +279,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentRepairRecordMainApi.exportEquipmentRepairRecordMain(
       tableObject.params
     )
     download.excel(data, '设备维修记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentReportRepairRequest/index.vue b/src/views/eam/equipmentReportRepairRequest/index.vue
index 7cabe2eab..b9a65fbcd 100644
--- a/src/views/eam/equipmentReportRepairRequest/index.vue
+++ b/src/views/eam/equipmentReportRepairRequest/index.vue
@@ -68,7 +68,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import * as EquipmentReportRepairApi from "@/api/eam/equipmentReportRepairRequest";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentReportRepairRequest' })
 
 const message = useMessage() // 消息弹窗
@@ -340,18 +341,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentReportRepairRequestApi.exportEquipmentReportRepairRequest(tableObject.params)
     download.excel(data, '设报修申请.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentShutdown/index.vue b/src/views/eam/equipmentShutdown/index.vue
index 18b838012..b8879f1f3 100644
--- a/src/views/eam/equipmentShutdown/index.vue
+++ b/src/views/eam/equipmentShutdown/index.vue
@@ -65,6 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentShutdown' })
 
@@ -196,18 +198,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentShutdownApi.exportEquipmentShutdown(tableObject.params)
     download.excel(data, '设备停机记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue
index e94de01e7..6ca9e21a6 100644
--- a/src/views/eam/equipmentSigning/index.vue
+++ b/src/views/eam/equipmentSigning/index.vue
@@ -68,7 +68,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as UserApi from '@/api/system/user'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentSigning' })
 
 const message = useMessage() // 消息弹窗
@@ -218,18 +219,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentSigningApi.exportEquipmentSigning(tableObject.params)
     download.excel(data, '设备到货签收记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSpotCheckDetail/index.vue b/src/views/eam/equipmentSpotCheckDetail/index.vue
index 3db57c929..f84a3ee78 100644
--- a/src/views/eam/equipmentSpotCheckDetail/index.vue
+++ b/src/views/eam/equipmentSpotCheckDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentSpotCheckDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentSpotCheckDetailApi.exportEquipmentSpotCheckDetail(tableObject.params)
     download.excel(data, '点检工单子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue
index 1c1bd0fac..6637bd8c2 100644
--- a/src/views/eam/equipmentSpotCheckMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckMain/index.vue
@@ -94,7 +94,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import * as EquipmentRepairJobMainApi from "@/api/eam/equipmentRepairJobMain";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentSpotCheckMain' })
 
 const message = useMessage() // 消息弹窗
@@ -514,18 +515,17 @@ const getData2=(val)=> {
 
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentSpotCheckMainApi.exportEquipmentSpotCheckMain(tableObject.params)
     download.excel(data, '点检工单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSpotCheckRecordDetail/index.vue b/src/views/eam/equipmentSpotCheckRecordDetail/index.vue
index 3b61dcfc4..b5159e57a 100644
--- a/src/views/eam/equipmentSpotCheckRecordDetail/index.vue
+++ b/src/views/eam/equipmentSpotCheckRecordDetail/index.vue
@@ -65,6 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'EquipmentSpotCheckRecordDetail' })
 
@@ -196,18 +198,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentSpotCheckRecordDetailApi.exportEquipmentSpotCheckRecordDetail(tableObject.params)
     download.excel(data, '点检记录子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSpotCheckRecordMain/index.vue b/src/views/eam/equipmentSpotCheckRecordMain/index.vue
index d3bb22d9c..b3a57a93b 100644
--- a/src/views/eam/equipmentSpotCheckRecordMain/index.vue
+++ b/src/views/eam/equipmentSpotCheckRecordMain/index.vue
@@ -78,7 +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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentSpotCheckRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -209,18 +210,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentSpotCheckRecordMainApi.exportEquipmentSpotCheckRecordMain(tableObject.params)
     download.excel(data, '点检记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentSupplier/index.vue b/src/views/eam/equipmentSupplier/index.vue
index af2a2bd16..19ca01f75 100644
--- a/src/views/eam/equipmentSupplier/index.vue
+++ b/src/views/eam/equipmentSupplier/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentSupplier' })
 
 const message = useMessage() // 消息弹窗
@@ -212,18 +213,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await EquipmentSupplierApi.exportEquipmentSupplier(tableObject.params)
     download.excel(data, '供应商.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentToolSparePart/index.vue b/src/views/eam/equipmentToolSparePart/index.vue
index aafeaa7f3..07f792339 100644
--- a/src/views/eam/equipmentToolSparePart/index.vue
+++ b/src/views/eam/equipmentToolSparePart/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentToolSparePart' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentToolSparePartApi.exportEquipmentToolSparePart(tableObject.params)
     download.excel(data, '设备或工装与备件关联.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/equipmentTransferRecord/index.vue b/src/views/eam/equipmentTransferRecord/index.vue
index c3fd5c72e..fa7a9b4ef 100644
--- a/src/views/eam/equipmentTransferRecord/index.vue
+++ b/src/views/eam/equipmentTransferRecord/index.vue
@@ -68,7 +68,8 @@ 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 UserApi from '@/api/system/user'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'EquipmentTransferRecord' })
 
 const message = useMessage() // 消息弹窗
@@ -215,18 +216,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await EquipmentTransferRecordApi.exportEquipmentTransferRecord(tableObject.params)
     download.excel(data, '设备移动记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/inspectionItem/index.vue b/src/views/eam/inspectionItem/index.vue
index 256e1bbe2..65d1b94b5 100644
--- a/src/views/eam/inspectionItem/index.vue
+++ b/src/views/eam/inspectionItem/index.vue
@@ -66,7 +66,8 @@ 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 InspectionItemSelectSetApi from "@/api/eam/inspectionItemSelectSet";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InspectionItem' })
 
 const message = useMessage() // 消息弹窗
@@ -214,18 +215,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await InspectionItemApi.exportInspectionItem(tableObject.params)
     download.excel(data, '巡检项.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/inspectionItemSelectSet/index.vue b/src/views/eam/inspectionItemSelectSet/index.vue
index 7b9ad8bec..b334f7add 100644
--- a/src/views/eam/inspectionItemSelectSet/index.vue
+++ b/src/views/eam/inspectionItemSelectSet/index.vue
@@ -57,7 +57,8 @@ 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 ItemForm from "@/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InspectionItemSelectSet' })
 
 const message = useMessage() // 消息弹窗
@@ -240,18 +241,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await InspectionItemSelectSetApi.exportInspectionItemSelectSet(tableObject.params)
     download.excel(data, '巡检项选择集.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/item/index.vue b/src/views/eam/item/index.vue
index c0df9c35b..b18fe42ee 100644
--- a/src/views/eam/item/index.vue
+++ b/src/views/eam/item/index.vue
@@ -89,7 +89,8 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { SearchTable } from '@/components/SearchTable'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Item' })
 
 const message = useMessage() // 消息弹窗
@@ -314,18 +315,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemApi.exportItem(tableObject.params)
     download.excel(data, '备件.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue
index 1085c7899..e4e220c6a 100644
--- a/src/views/eam/itemAccounts/index.vue
+++ b/src/views/eam/itemAccounts/index.vue
@@ -91,7 +91,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ItemAccounts' })
 
 const message = useMessage() // 消息弹窗
@@ -364,18 +365,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemAccountsApi.exportItemAccounts(tableObject.params)
     download.excel(data, '备件台账.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/itemApplyMain/index.vue b/src/views/eam/itemApplyMain/index.vue
index fcb9945ed..4e943ce54 100644
--- a/src/views/eam/itemApplyMain/index.vue
+++ b/src/views/eam/itemApplyMain/index.vue
@@ -54,7 +54,9 @@
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
+  
   // 采购订单
   defineOptions({ name: 'ItemApplyMain' })
 
@@ -251,18 +253,17 @@
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await ItemApplyMainApi.exportItemApplyMain(tableObject.params)
       download.excel(data, '备件申领记录主.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/itemDelete/index.vue b/src/views/eam/itemDelete/index.vue
index 3d750cfe9..776e24781 100644
--- a/src/views/eam/itemDelete/index.vue
+++ b/src/views/eam/itemDelete/index.vue
@@ -98,6 +98,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ItemDelete' })
 
@@ -352,18 +354,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await ItemAccountsApi.exportItemAccounts(tableObject.params)
     download.excel(data, '备件台账.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/itemInLocation/index.vue b/src/views/eam/itemInLocation/index.vue
index 725f78ec0..58ce72bd4 100644
--- a/src/views/eam/itemInLocation/index.vue
+++ b/src/views/eam/itemInLocation/index.vue
@@ -47,7 +47,9 @@
   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 { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
+  
   defineOptions({ name: 'ItemInLocation' })
 
   const message = useMessage() // 消息弹窗
@@ -177,18 +179,17 @@
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await ItemInLocationApi.exportItemInLocation(tableObject.params)
       download.excel(data, '备件入库记录.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/itemLocationReplace/index.vue b/src/views/eam/itemLocationReplace/index.vue
index 939d5693e..05effa5f3 100644
--- a/src/views/eam/itemLocationReplace/index.vue
+++ b/src/views/eam/itemLocationReplace/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ItemLocationReplace' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemLocationReplaceApi.exportItemLocationReplace(tableObject.params)
     download.excel(data, '备件库位变更记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/itemMaintenance/index.vue b/src/views/eam/itemMaintenance/index.vue
index c21050d6c..1f36700c8 100644
--- a/src/views/eam/itemMaintenance/index.vue
+++ b/src/views/eam/itemMaintenance/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ItemMaintenance' })
 
 const message = useMessage() // 消息弹窗
@@ -195,18 +196,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemMaintenanceApi.exportItemMaintenance(tableObject.params)
     download.excel(data, '备件维修记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/itemOrderMain/index.vue b/src/views/eam/itemOrderMain/index.vue
index b37492d05..22e951920 100644
--- a/src/views/eam/itemOrderMain/index.vue
+++ b/src/views/eam/itemOrderMain/index.vue
@@ -55,7 +55,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
   // 采购订单
   defineOptions({ name: 'ItemOrderMain' })
 
@@ -218,18 +219,17 @@
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const data = await ItemOrderMainApi.exportItemOrderMain(tableObject.params)
       download.excel(data, '备件申领记录主.xlsx')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/itemOutLocation/index.vue b/src/views/eam/itemOutLocation/index.vue
index 0773cbbbd..91ec60536 100644
--- a/src/views/eam/itemOutLocation/index.vue
+++ b/src/views/eam/itemOutLocation/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ItemOutLocation' })
 
 const message = useMessage() // 消息弹窗
@@ -195,18 +196,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemOutLocationApi.exportItemOutLocation(tableObject.params)
     download.excel(data, '备件出库记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/location/index.vue b/src/views/eam/location/index.vue
index 12849ebd6..b3e96a4c8 100644
--- a/src/views/eam/location/index.vue
+++ b/src/views/eam/location/index.vue
@@ -76,7 +76,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Location' })
 
 const message = useMessage() // 消息弹窗
@@ -237,18 +238,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await LocationApi.exportLocation(tableObject.params)
     download.excel(data, '库位.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/locationArea/index.vue b/src/views/eam/locationArea/index.vue
index 55b19d688..f9453be9f 100644
--- a/src/views/eam/locationArea/index.vue
+++ b/src/views/eam/locationArea/index.vue
@@ -44,7 +44,8 @@
   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 { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
   defineOptions({ name: 'LocationArea' })
 
   const message = useMessage() // 消息弹窗
@@ -188,18 +189,18 @@
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
+
       const data = await LocationAreaApi.exportLocationArea(tableObject.params)
       download.excel(data, '库区.xls')
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
index 458f528f6..0f88560ae 100644
--- a/src/views/eam/maintainExperience/index.vue
+++ b/src/views/eam/maintainExperience/index.vue
@@ -77,7 +77,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MaintainExperience' })
 
 const message = useMessage() // 消息弹窗
@@ -208,18 +209,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MaintainExperienceApi.exportMaintainExperience(tableObject.params)
     download.excel(data, '保养经验记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/maintenance/index.vue b/src/views/eam/maintenance/index.vue
index 53e6c4c68..b9416c6bb 100644
--- a/src/views/eam/maintenance/index.vue
+++ b/src/views/eam/maintenance/index.vue
@@ -73,7 +73,8 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'Maintenance' })
 
@@ -344,18 +345,17 @@ const onChange = (field, item) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MaintenanceApi.exportMaintenance(tableObject.params)
     download.excel(data, '保养计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/maintenanceItem/index.vue b/src/views/eam/maintenanceItem/index.vue
index bf32498c2..2d7512af8 100644
--- a/src/views/eam/maintenanceItem/index.vue
+++ b/src/views/eam/maintenanceItem/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MaintenanceItem' })
 
 const message = useMessage() // 消息弹窗
@@ -211,18 +212,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MaintenanceItemApi.exportMaintenanceItem(tableObject.params)
     download.excel(data, '保养项维护.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/maintenanceItemSelectSet/index.vue b/src/views/eam/maintenanceItemSelectSet/index.vue
index a27d398b8..2928f06e3 100644
--- a/src/views/eam/maintenanceItemSelectSet/index.vue
+++ b/src/views/eam/maintenanceItemSelectSet/index.vue
@@ -58,7 +58,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import ItemForm from "@/views/eam/maintenanceItemSelectSet/itemSelectSetForm.vue";
 import * as InspectionItemSelectSetApi from "@/api/eam/inspectionItemSelectSet";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicMaintenanceItemSelectSet' })
 
 const message = useMessage() // 消息弹窗
@@ -241,18 +242,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicMaintenanceItemSelectSetApi.exportBasicMaintenanceItemSelectSet(tableObject.params)
     download.excel(data, '保养项选择集.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/planInspection/index.vue b/src/views/eam/planInspection/index.vue
index 237c839f1..51585ec17 100644
--- a/src/views/eam/planInspection/index.vue
+++ b/src/views/eam/planInspection/index.vue
@@ -73,7 +73,8 @@ import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
 import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import AudiForm from '@/views/eam/planInspection/audiForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PlanInspection' })
 
 const message = useMessage() // 消息弹窗
@@ -343,18 +344,17 @@ const onChange = (field, item) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PlanInspectionApi.exportPlanInspection(tableObject.params)
     download.excel(data, '巡检计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/planSpotCheck/index.vue b/src/views/eam/planSpotCheck/index.vue
index af5403b82..ba9237562 100644
--- a/src/views/eam/planSpotCheck/index.vue
+++ b/src/views/eam/planSpotCheck/index.vue
@@ -74,7 +74,8 @@ import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 import AudiForm from '@/views/eam/planSpotCheck/audiForm.vue'
 import {updateSpotCheckPlan} from "@/api/eam/planSpotCheck";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PlanSpotCheck' })
 
 const message = useMessage() // 消息弹窗
@@ -375,18 +376,18 @@ const getData=(val)=> {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await PlanSpotCheckApi.exportPlanSpotCheck(tableObject.params)
     download.excel(data, '点检计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/recordDeviceChanged/index.vue b/src/views/eam/recordDeviceChanged/index.vue
index 31af76028..7e78b8e6d 100644
--- a/src/views/eam/recordDeviceChanged/index.vue
+++ b/src/views/eam/recordDeviceChanged/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'RecordDeviceChanged' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await RecordDeviceChangedApi.exportRecordDeviceChanged(tableObject.params)
     download.excel(data, '设备变更记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/relationMainPart/index.vue b/src/views/eam/relationMainPart/index.vue
index f781d723f..9e605b335 100644
--- a/src/views/eam/relationMainPart/index.vue
+++ b/src/views/eam/relationMainPart/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'RelationMainPart' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await RelationMainPartApi.exportRelationMainPart(tableObject.params)
     download.excel(data, '主要部件关联.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue
index 94a9d463b..c8d8a68b1 100644
--- a/src/views/eam/repairExperience/index.vue
+++ b/src/views/eam/repairExperience/index.vue
@@ -80,7 +80,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'RepairExperience' })
 
 const message = useMessage() // 消息弹窗
@@ -211,18 +212,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await RepairExperienceApi.exportRepairExperience(tableObject.params)
     download.excel(data, '维修经验记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/repairSparePartsRecord/index.vue b/src/views/eam/repairSparePartsRecord/index.vue
index af8626c6d..2700a2661 100644
--- a/src/views/eam/repairSparePartsRecord/index.vue
+++ b/src/views/eam/repairSparePartsRecord/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'RepairSparePartsRecord' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await RepairSparePartsRecordApi.exportRepairSparePartsRecord(tableObject.params)
     download.excel(data, '备件维修申请.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/repairSparePartsRequest/index.vue b/src/views/eam/repairSparePartsRequest/index.vue
index 873bb7a7e..fc48102ec 100644
--- a/src/views/eam/repairSparePartsRequest/index.vue
+++ b/src/views/eam/repairSparePartsRequest/index.vue
@@ -65,6 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'RepairSparePartsRequest' })
 
@@ -196,18 +198,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await RepairSparePartsRequestApi.exportRepairSparePartsRequest(tableObject.params)
     download.excel(data, '备件维修申请.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/sparePart/index.vue b/src/views/eam/sparePart/index.vue
index 5c16bad14..e93993997 100644
--- a/src/views/eam/sparePart/index.vue
+++ b/src/views/eam/sparePart/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SparePart' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartApi.exportSparePart(tableObject.params)
     download.excel(data, '备件基础.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/sparePartsApplyMain/index.vue b/src/views/eam/sparePartsApplyMain/index.vue
index c1e7127d1..aaf5fb3a9 100644
--- a/src/views/eam/sparePartsApplyMain/index.vue
+++ b/src/views/eam/sparePartsApplyMain/index.vue
@@ -113,7 +113,8 @@ import * as SparePartsApplyDetailApi from '@/api/eam/sparePartsApplyDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'SparePartsApply' })
 
@@ -315,18 +316,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleMainExport = async (id: number) => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(id)
     download.excel(data, '盘点工单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -349,12 +349,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(tableObject.params)
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue
index 50f7a9a99..e9059f681 100644
--- a/src/views/eam/sparepartsinlocation/index.vue
+++ b/src/views/eam/sparepartsinlocation/index.vue
@@ -112,7 +112,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 AudiForm from '@/views/eam/sparepartsinlocation/audiForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'SparePartsApply' })
 
@@ -322,21 +323,20 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-const exportLoading = ref(false) // 导出的加载中
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsInLocationMainApi.exportSparePartsInLocationMain(
       tableObject.params
     )
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/sparepartsoutlocation/index.vue b/src/views/eam/sparepartsoutlocation/index.vue
index 64c25a0f0..e9532a17e 100644
--- a/src/views/eam/sparepartsoutlocation/index.vue
+++ b/src/views/eam/sparepartsoutlocation/index.vue
@@ -101,7 +101,8 @@ import * as SparePartsOutLocationDetailApi from '@/api/eam/sparePartsOutLocation
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'SparePartsOutLocation' })
 
@@ -283,18 +284,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleMainExport = async (id: number) => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(id)
     download.excel(data, '盘点工单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -317,14 +317,14 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(
       tableObject.params
     )
     download.excel(data, '备件申领记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/spotCheckItem/index.vue b/src/views/eam/spotCheckItem/index.vue
index 997bae35f..1241028f0 100644
--- a/src/views/eam/spotCheckItem/index.vue
+++ b/src/views/eam/spotCheckItem/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SpotCheckItem' })
 
 const message = useMessage() // 消息弹窗
@@ -211,18 +212,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SpotCheckItemApi.exportSpotCheckItem(tableObject.params)
     download.excel(data, '点检项.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/spotCheckSelectSet/index.vue b/src/views/eam/spotCheckSelectSet/index.vue
index 0ac3114fa..d27df8436 100644
--- a/src/views/eam/spotCheckSelectSet/index.vue
+++ b/src/views/eam/spotCheckSelectSet/index.vue
@@ -57,7 +57,8 @@ 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 ItemForm from "@/views/eam/spotCheckSelectSet/itemSelectSetForm.vue";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'BasicSpotCheckSelectSet' })
 
 const message = useMessage() // 消息弹窗
@@ -240,18 +241,17 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BasicSpotCheckSelectSetApi.exportBasicSpotCheckSelectSet(tableObject.params)
     download.excel(data, '点检选择集维护.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/tableDataExtendedAttribute/index.vue b/src/views/eam/tableDataExtendedAttribute/index.vue
index 2fab0094e..4eb924367 100644
--- a/src/views/eam/tableDataExtendedAttribute/index.vue
+++ b/src/views/eam/tableDataExtendedAttribute/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'TableDataExtendedAttribute' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await TableDataExtendedAttributeApi.exportTableDataExtendedAttribute(tableObject.params)
     download.excel(data, '表数据扩展属性字段.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolAccounts/index.vue b/src/views/eam/toolAccounts/index.vue
index 02e8625b1..55d7eb779 100644
--- a/src/views/eam/toolAccounts/index.vue
+++ b/src/views/eam/toolAccounts/index.vue
@@ -151,7 +151,8 @@ import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 import * as UserApi from '@/api/system/user'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ToolAccounts' })
 
 const message = useMessage() // 消息弹窗
@@ -353,18 +354,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ToolAccountsApi.exportToolAccounts(tableObject.params)
     download.excel(data, '工装台账.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolChangedRecord/index.vue b/src/views/eam/toolChangedRecord/index.vue
index 104629338..12886c60d 100644
--- a/src/views/eam/toolChangedRecord/index.vue
+++ b/src/views/eam/toolChangedRecord/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ToolChangedRecord' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ToolChangedRecordApi.exportToolChangedRecord(tableObject.params)
     download.excel(data, '设备变更记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolEquipmentIn/index.vue b/src/views/eam/toolEquipmentIn/index.vue
index 902fc3be5..648ea3273 100644
--- a/src/views/eam/toolEquipmentIn/index.vue
+++ b/src/views/eam/toolEquipmentIn/index.vue
@@ -83,7 +83,8 @@ import * as ProductionlineApi from '@/api/wms/productionline'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as EquipmentManufacturerApi from '@/api/eam/equipmentManufacturer'
 import * as ToolAccountsApi from '@/api/eam/toolAccounts'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ToolEquipmentIn' })
 
 const message = useMessage() // 消息弹窗
@@ -242,18 +243,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
+
     const data = await ToolEquipmentInApi.exportToolEquipmentIn(tableObject.params)
     download.excel(data, '工装入库记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolEquipmentOut/index.vue b/src/views/eam/toolEquipmentOut/index.vue
index e8238edef..7bad03828 100644
--- a/src/views/eam/toolEquipmentOut/index.vue
+++ b/src/views/eam/toolEquipmentOut/index.vue
@@ -66,6 +66,8 @@ 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 ToolAccountsApi from '@/api/eam/toolAccounts'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ToolEquipmentOut' })
 
@@ -205,18 +207,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ToolEquipmentOutApi.exportToolEquipmentOut(tableObject.params)
     download.excel(data, '工装出库记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolMod/index.vue b/src/views/eam/toolMod/index.vue
index 73ae1af75..68a68b3e2 100644
--- a/src/views/eam/toolMod/index.vue
+++ b/src/views/eam/toolMod/index.vue
@@ -69,6 +69,8 @@ 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 TeamForm from "./operateForm.vue";
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ToolMod' })
 
 const message = useMessage() // 消息弹窗
@@ -203,18 +205,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ToolModApi.exportToolMod(tableObject.params)
     download.excel(data, '工装物料关联.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/toolSigning/index.vue b/src/views/eam/toolSigning/index.vue
index abcad9423..f99335c11 100644
--- a/src/views/eam/toolSigning/index.vue
+++ b/src/views/eam/toolSigning/index.vue
@@ -68,7 +68,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as EquipmentSupplierApi from '@/api/eam/equipmentSupplier'
 import * as UserApi from '@/api/system/user'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ToolSigning' })
 
 const message = useMessage() // 消息弹窗
@@ -209,18 +210,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ToolSigningApi.exportToolSigning(tableObject.params)
     download.excel(data, '工装到货签收记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/eam/transaction/index.vue b/src/views/eam/transaction/index.vue
index 1c248a84d..c7ff4f008 100644
--- a/src/views/eam/transaction/index.vue
+++ b/src/views/eam/transaction/index.vue
@@ -66,6 +66,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'Transaction' })
 
@@ -205,18 +207,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await TransactionApi.exportTransaction(tableObject.params)
     download.excel(data, '库存事务.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
index 245f43334..e937d58b2 100644
--- a/src/views/infra/apiAccessLog/index.vue
+++ b/src/views/infra/apiAccessLog/index.vue
@@ -93,7 +93,8 @@ import download from '@/utils/download'
 import { formatDate } from '@/utils/formatTime'
 import * as ApiAccessLogApi from '@/api/infra/apiAccessLog'
 import ApiAccessLogDetail from './ApiAccessLogDetail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InfraApiAccessLog' })
 
 const message = useMessage() // 消息弹窗
@@ -151,12 +152,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
     download.excel(data, 'API 访问日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
index 683675545..281b9ff84 100644
--- a/src/views/infra/apiErrorLog/index.vue
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -162,7 +162,8 @@ import download from '@/utils/download'
 import * as ApiErrorLogApi from '@/api/infra/apiErrorLog'
 import ApiErrorLogDetail from './ApiErrorLogDetail.vue'
 import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InfraApiErrorLog' })
 
 const message = useMessage() // 消息弹窗
@@ -233,12 +234,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ApiErrorLogApi.exportApiErrorLog(queryParams)
     download.excel(data, '异常日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
index eac5d1684..46893f423 100644
--- a/src/views/infra/config/index.vue
+++ b/src/views/infra/config/index.vue
@@ -100,7 +100,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ConfigApi from '@/api/infra/config'
 import ConfigForm from './ConfigForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InfraConfig' })
 
 const message = useMessage() // 消息弹窗
@@ -169,12 +170,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ConfigApi.exportConfig(queryParams)
     download.excel(data, '参数配置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
index d662abc17..c51f7ec06 100644
--- a/src/views/infra/job/index.vue
+++ b/src/views/infra/job/index.vue
@@ -103,7 +103,8 @@ import JobDetail from './JobDetail.vue'
 import download from '@/utils/download'
 import * as JobApi from '@/api/infra/job'
 import { InfraJobStatusEnum } from '@/utils/constants'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InfraJob' })
 
 const { t } = useI18n() // 国际化
@@ -153,12 +154,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await JobApi.exportJob(queryParams)
     download.excel(data, '定时任务.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue
index a9fb08f97..c7b8c1f5f 100644
--- a/src/views/infra/job/logger/index.vue
+++ b/src/views/infra/job/logger/index.vue
@@ -123,7 +123,8 @@ import { formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import JobLogDetail from './JobLogDetail.vue'
 import * as JobLogApi from '@/api/infra/jobLog'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InfraJobLog' })
 
 const message = useMessage() // 消息弹窗
@@ -180,12 +181,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await JobLogApi.exportJobLog(queryParams)
     download.excel(data, '定时任务执行日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/abilityInfo/index.vue b/src/views/mes/abilityInfo/index.vue
index 6c6a81d4d..de88e008a 100644
--- a/src/views/mes/abilityInfo/index.vue
+++ b/src/views/mes/abilityInfo/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'AbilityInfo' })
 
 const message = useMessage() // 消息弹窗
@@ -206,18 +207,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await AbilityInfoApi.exportAbilityInfo(tableObject.params)
     download.excel(data, '能力矩阵信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/dismantlingMain/index.vue b/src/views/mes/dismantlingMain/index.vue
index 5e7a4a94b..542d078e2 100644
--- a/src/views/mes/dismantlingMain/index.vue
+++ b/src/views/mes/dismantlingMain/index.vue
@@ -82,7 +82,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesDismantlingMain' })
 
 const message = useMessage() // 消息弹窗
@@ -242,18 +243,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await DismantlingMainApi.exportDismantlingMain(tableObject.params)
     download.excel(data, '报废拆解登记主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/holiday/index.vue b/src/views/mes/holiday/index.vue
index a646cfdf0..6f56855f8 100644
--- a/src/views/mes/holiday/index.vue
+++ b/src/views/mes/holiday/index.vue
@@ -65,7 +65,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 '../../mes/components/Detail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Holiday' })
 
 const message = useMessage() // 消息弹窗
@@ -178,18 +179,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await HolidayApi.exportHoliday(tableObject.params)
     download.excel(data, '节假日设置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/hrPersonAbility/index.vue b/src/views/mes/hrPersonAbility/index.vue
index a4bc513f0..108dad806 100644
--- a/src/views/mes/hrPersonAbility/index.vue
+++ b/src/views/mes/hrPersonAbility/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'HrPersonAbility' })
 
 const message = useMessage() // 消息弹窗
@@ -218,18 +219,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await HrPersonAbilityApi.exportHrPersonAbility(tableObject.params)
     download.excel(data, '人员能力矩阵配置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/item/index.vue b/src/views/mes/item/index.vue
index b274a01cc..dea550e7e 100644
--- a/src/views/mes/item/index.vue
+++ b/src/views/mes/item/index.vue
@@ -66,7 +66,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QmsItem' })
 
 const message = useMessage() // 消息弹窗
@@ -259,18 +260,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemApi.exportItem(tableObject.params)
     download.excel(data, '质检项目定义.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/itemRequestMain/index.vue b/src/views/mes/itemRequestMain/index.vue
index 291647ef1..31a5d01c7 100644
--- a/src/views/mes/itemRequestMain/index.vue
+++ b/src/views/mes/itemRequestMain/index.vue
@@ -82,7 +82,8 @@ import * as ItemRequestDetailApi from '@/api/mes/itemRequestDetail'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '../components/Detail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesItemRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -213,18 +214,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ItemRequestMainApi.exportItemRequestMain(tableObject.params)
     download.excel(data, '叫料申请单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue
index 48bb42dd9..8ac58c897 100644
--- a/src/views/mes/opersteps/index.vue
+++ b/src/views/mes/opersteps/index.vue
@@ -65,7 +65,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Opersteps' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await OperstepsApi.exportOpersteps(tableObject.params)
     download.excel(data, 'MES操作步骤信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue
index 761b74318..43e9d441b 100644
--- a/src/views/mes/operstepsType/index.vue
+++ b/src/views/mes/operstepsType/index.vue
@@ -65,7 +65,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'OperstepsType' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await OperstepsTypeApi.exportOperstepsType(tableObject.params)
     download.excel(data, '操作步骤类型配置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index 72992349e..32da7ddee 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -84,7 +84,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import orderDetail from './components/orderDetail.vue'
 import scheduleDetail from './components/schedule.vue'
 import scheduleDetailR from './components/scheduleDetail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 
 defineOptions({ name: 'MesOrderDay' })
@@ -323,18 +324,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await OrderDayApi.exportOrderDay(tableObject.params)
     download.excel(data, '生产日计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 const stopPlan = async (id) => {
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index d525dfc0f..687bfa0c2 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -110,7 +110,8 @@ import {
   MesOrderMonthMainVO,
   MesOrderMonthSubVO
 } from "@/api/mes/ordermonthplan";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesOrderMonthMain' })
 
 const message = useMessage() // 消息弹窗
@@ -243,18 +244,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MesOrderMonthApi.exportMesOrderMonthMain(tableObject.params)
     download.excel(data, '订单计划月主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue
index 459f4190f..85788116e 100644
--- a/src/views/mes/pattern/index.vue
+++ b/src/views/mes/pattern/index.vue
@@ -65,7 +65,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Pattern' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PatternApi.exportPattern(tableObject.params)
     download.excel(data, '模具基本信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/patternType/index.vue b/src/views/mes/patternType/index.vue
index e0cc50b14..14844ad61 100644
--- a/src/views/mes/patternType/index.vue
+++ b/src/views/mes/patternType/index.vue
@@ -65,7 +65,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PatternType' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PatternTypeApi.exportPatternType(tableObject.params)
     download.excel(data, '模具类型.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/process/index.vue b/src/views/mes/process/index.vue
index 8e49c9816..15c7b0057 100644
--- a/src/views/mes/process/index.vue
+++ b/src/views/mes/process/index.vue
@@ -95,7 +95,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from './components/Detail.vue'
 import {goalParams} from "@/api/mes/process";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Process' })
 
 const message = useMessage() // 消息弹窗
@@ -315,18 +316,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ProcessApi.exportProcess(tableObject.params)
     download.excel(data, '工序.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue
index c7a0a30ff..897f1ec56 100644
--- a/src/views/mes/processroute/index.vue
+++ b/src/views/mes/processroute/index.vue
@@ -66,7 +66,8 @@ 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 ProcessRouteConfig from './components/configDialog.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'Processroute' })
 
@@ -233,18 +234,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ProcessrouteApi.exportProcessroute(tableObject.params)
     download.excel(data, '工艺路线定义.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 /** 路线配置操作 */
diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue
index 11c9eb1d5..a8944c3e7 100644
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesProductBackline' })
 
 const message = useMessage() // 消息弹窗
@@ -212,18 +213,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ProductBacklineApi.exportProductBackline(tableObject.params)
     download.excel(data, '产品返线登记.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue
index 2165b6415..b949bfbf2 100644
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesProductOffline' })
 
 const message = useMessage() // 消息弹窗
@@ -212,18 +213,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ProductOfflineApi.exportProductOffline(tableObject.params)
     download.excel(data, '产品离线登记记录.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/productionPlan/index.vue b/src/views/mes/productionPlan/index.vue
index 1c9271bea..c78f50814 100644
--- a/src/views/mes/productionPlan/index.vue
+++ b/src/views/mes/productionPlan/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesProductionPlan' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ProductionPlanApi.exportProductionPlan(tableObject.params)
     download.excel(data, '生产排产计划.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/qualityclass/index.vue b/src/views/mes/qualityclass/index.vue
index aa7018cab..90ac3c852 100644
--- a/src/views/mes/qualityclass/index.vue
+++ b/src/views/mes/qualityclass/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QmsQualityclass' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await QualityclassApi.exportQualityclass(tableObject.params)
     download.excel(data, '质检类别.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue
index d48931b53..d184ffa0f 100644
--- a/src/views/mes/qualityform/index.vue
+++ b/src/views/mes/qualityform/index.vue
@@ -79,7 +79,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as QualityformDetailApi from '@/api/mes/qualityformdetail'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '../components/Detail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QmsQualityform' })
 
 const message = useMessage() // 消息弹窗
@@ -242,18 +243,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await QualityformApi.exportQualityform(tableObject.params)
     download.excel(data, '质检表单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/qualityformlog/index.vue b/src/views/mes/qualityformlog/index.vue
index 9404ddf09..6a8cd784f 100644
--- a/src/views/mes/qualityformlog/index.vue
+++ b/src/views/mes/qualityformlog/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QmsQualityformlog' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await QualityformlogApi.exportQualityformlog(tableObject.params)
     download.excel(data, '质检表单日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/qualitygroup/index.vue b/src/views/mes/qualitygroup/index.vue
index 04d6a8e6b..c5444d4b4 100644
--- a/src/views/mes/qualitygroup/index.vue
+++ b/src/views/mes/qualitygroup/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QmsQualitygroup' })
 
 const message = useMessage() // 消息弹窗
@@ -205,18 +206,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await QualitygroupApi.exportQualitygroup(tableObject.params)
     download.excel(data, '质检分组.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/reportpStore/index.vue b/src/views/mes/reportpStore/index.vue
index 4dc9f9542..057175541 100644
--- a/src/views/mes/reportpStore/index.vue
+++ b/src/views/mes/reportpStore/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesReportpStore' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ReportpStoreApi.exportReportpStore(tableObject.params)
     download.excel(data, '工序报工物料明细.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/reworkBatch/index.vue b/src/views/mes/reworkBatch/index.vue
index 252ba6c8f..a1c44881b 100644
--- a/src/views/mes/reworkBatch/index.vue
+++ b/src/views/mes/reworkBatch/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesReworkBatch' })
 
 const message = useMessage() // 消息弹窗
@@ -271,18 +272,17 @@ const handleFinish = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ReworkBatchApi.exportReworkBatch(tableObject.params)
     download.excel(data, '返工返修登记（批量）.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/reworkSingle/index.vue b/src/views/mes/reworkSingle/index.vue
index d8e8eb2b8..04029b40b 100644
--- a/src/views/mes/reworkSingle/index.vue
+++ b/src/views/mes/reworkSingle/index.vue
@@ -66,7 +66,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.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesReworkSingle' })
 
 const message = useMessage() // 消息弹窗
@@ -271,18 +272,17 @@ const handleFinish = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ReworkSingleApi.exportReworkSingle(tableObject.params)
     download.excel(data, '返工返修登记（单件）数据.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/teamSetting/index.vue b/src/views/mes/teamSetting/index.vue
index 135bba85f..5fe13a3e7 100644
--- a/src/views/mes/teamSetting/index.vue
+++ b/src/views/mes/teamSetting/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesTeamSetting' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await TeamSettingApi.exportTeamSetting(tableObject.params)
     download.excel(data, '班组人员管理.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index 8ca2069cd..d69a1b926 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -87,7 +87,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from './components/Detail.vue'
 import ReportAll from './components/reportAll.vue'
 import Finish from './components/finish.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 
 defineOptions({ name: 'MesWorkScheduling' })
@@ -290,18 +291,17 @@ const changeBillStatus=async(row,status)=>{
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await WorkSchedulingApi.exportWorkScheduling(tableObject.params)
     download.excel(data, '生产任务排产.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/mes/workSchedulingQaform/index.vue b/src/views/mes/workSchedulingQaform/index.vue
index b40dddee2..b7053e5a0 100644
--- a/src/views/mes/workSchedulingQaform/index.vue
+++ b/src/views/mes/workSchedulingQaform/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MesWorkSchedulingQaform' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await WorkSchedulingQaformApi.exportWorkSchedulingQaform(tableObject.params)
     download.excel(data, '任务质检单.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index e3ccacf2b..46edb659b 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -80,7 +80,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Aql' })
 
 const message = useMessage() // 消息弹窗
@@ -261,19 +262,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await AqlApi.exportAql(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue
index 6a02cd889..37a422350 100644
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@@ -76,7 +76,8 @@ import { formatDate } from '@/utils/formatTime'
 // 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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Counter' })
 
 const message = useMessage() // 消息弹窗
@@ -229,19 +230,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CounterApi.exportCounter(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index 9643b42a5..c10632a51 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -113,7 +113,8 @@ import { formatDate } from '@/utils/formatTime'
 // 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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'DynamicRule' })
 
 const message = useMessage() // 消息弹窗
@@ -307,19 +308,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DynamicRuleApi.exportDynamicRule(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 16c5c260d..e41beb82b 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -124,7 +124,8 @@ import Detail from './detail.vue'
 import { getReportUrl } from '@/utils/systemParam'
 import { useUserStore } from '@/store/modules/user'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -414,19 +415,18 @@ const handleAbandon = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionJobMainApi.exportInspectionJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index 4e3bb66ab..dc1dca735 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -90,7 +90,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InspectionMethod' })
 
 const message = useMessage() // 消息弹窗
@@ -294,19 +295,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionMethodApi.exportInspectionMethod(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
index 6092df882..e1f70ab80 100644
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -85,6 +85,8 @@ import * as CustomeritemApi from '@/api/wms/customeritem'
 import * as CustomerApi from '@/api/wms/customer'
 
 import { useUserStore } from '@/store/modules/user'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 const userStore = useUserStore()
 
 defineOptions({ name: 'InspectionQ1' })
@@ -364,19 +366,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await Q1Api.exportQ1(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 13e5fc996..20be438ea 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -56,7 +56,18 @@
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
     @onChange="onChange"
-  />
+  >
+  <template #searchQuerypurchaseReceiptNumber>
+      <el-form :inline="true">
+        <el-form-item label="供应商物料代码">
+          <el-input v-model="basicFormRef.formRef.formModel.itemCode" placeholder="请输入供应商" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="供应商代码">
+          <el-input v-model="basicFormRef.formRef.formModel.supplierCode" placeholder="请输入物料号" disabled></el-input>
+        </el-form-item>
+      </el-form>
+  </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Q2.allSchemas" />
@@ -83,8 +94,9 @@ import { formatDate } from '@/utils/formatTime'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import * as SupplierApi from '@/api/wms/supplier'
 import * as ItembasicApi from '@/api/wms/itembasic'
-
 import { useUserStore } from '@/store/modules/user'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 const userStore = useUserStore()
 
 defineOptions({ name: 'InspectionQ2' })
@@ -103,6 +115,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(async () => {
     const setV = {}
     if (formField == 'supplierCode') {
+      setV['purchaseReceiptNumber'] = ''
       const supplierParams = {
         by: 'ASC',
         filters: [{ column: 'code', action: '==', value: val[0].supplierCode }],
@@ -118,19 +131,82 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
           })
         }
       })
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+
+    if (formField == 'purchaseReceiptNumber') {
+      let result = ''
+      for (var i = 0; i < val.length; i++) {
+        result += val[i].number + ','
+      }
+      if (result.endsWith(',')) {
+        result = result.substring(0, result.length - 1)
+      }
+      setV['purchaseReceiptNumber'] = result
+      formRef.setValues(setV)
+    }
+
+    if (formField == 'lightItemCode') {
+      setV['lightItemCode'] = val[0].code
+      setV['lightItemName'] = val[0].name
+       const params2 = {
+        by: 'ASC',
+        filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      params2.isSearch = true
+      StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+          formRef.setValues({
+            standardCostPrice: priceObj.value.price
+          })
+        }
+      })
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+
+     if (formField == 'q1Number') {
+      setV['q1Number'] = val[0].code
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+
+    if (formField == 'costCode') {
+      setV['costCode'] = val[0].costcentreCode
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
     }
+
     if (formField == 'itemCode') {
       setV['SupplierCode'] = ''
       setV['SupplierName'] = ''
       setV['itemName'] = ''
       setV['standardCostPrice'] = ''
-      setV['qty'] = ''
+      setV['lightQty'] = 0
       setV['claimAmount'] = ''
-
+      setV['otherclaimAmount'] = 0
+      setV['summaryAmount'] = 0
+      setV['disbursementAmount'] = 0
+      setV['remainingAmount'] = 0
+      setV['purchaseReceiptNumber'] = ''
       setV['uom'] = val[0].supplierUom
+
+      Q2Api.getEmail().then((res) => {
+        if (res) {
+          formRef.setValues({
+            cashierEmail: res
+          })
+        }
+      })
+
       const supplieritemParams = {
         by: 'ASC',
-        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode}],
+        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
         pageNo: 1,
         pageSize: 500,
         sort: ''
@@ -154,6 +230,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
         pageSize: 500,
         sort: ''
       }
+
       itembasicParams.isSearch = true
       ItembasicApi.getItembasicPage(itembasicParams).then((res) => {
         if (res.list?.length > 0) {
@@ -163,59 +240,106 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
         }
       })
 
-      const params2 = {
-        by: 'ASC',
-        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
-        pageNo: 1,
-        pageSize: 500,
-        sort: ''
-      }
-      params2.isSearch = true
-      StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
-        if (res.list?.length > 0) {
-          priceObj.value = res.list[0]
-          formRef.setValues({
-            standardCostPrice: priceObj.value.price
-          })
-        }
-      })
+      // const params2 = {
+      //   by: 'ASC',
+      //   filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+      //   pageNo: 1,
+      //   pageSize: 500,
+      //   sort: ''
+      // }
+      // params2.isSearch = true
+      // StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+      //   if (res.list?.length > 0) {
+      //     priceObj.value = res.list[0]
+      //     formRef.setValues({
+      //       standardCostPrice: priceObj.value.price
+      //     })
+      //   }
+      // })
+
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
     }
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
   })
 }
 
 const onChange = (field, e) => {
-  if (field == 'qty') {
+  if (field == 'lightQty') {
     basicFormRef.value.formRef.formModel.claimAmount = (
-      parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice)
+      parseFloat(basicFormRef.value.formRef.formModel.lightQty) *
+      parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) *
+      parseFloat(basicFormRef.value.formRef.formModel.claimMultiple)
+    ).toFixed(6)
+    basicFormRef.value.formRef.formModel.summaryAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
+      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
     ).toFixed(6)
-     basicFormRef.value.formRef.formModel.summaryAmount = (
-      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+    basicFormRef.value.formRef.formModel.remainingAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
+      parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
+    ).toFixed(6)
+  }
+  if (field == 'claimMultiple') {
+    basicFormRef.value.formRef.formModel.claimAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.lightQty) *
+      parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) *
+      parseFloat(basicFormRef.value.formRef.formModel.claimMultiple)
+    ).toFixed(6)
+    basicFormRef.value.formRef.formModel.summaryAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
+      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+    ).toFixed(6)
+    basicFormRef.value.formRef.formModel.remainingAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
+      parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
     ).toFixed(6)
   }
   if (field == 'otherclaimAmount') {
     basicFormRef.value.formRef.formModel.summaryAmount = (
-      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
-      
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
+      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+    ).toFixed(6)
+    basicFormRef.value.formRef.formModel.remainingAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
+      parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
     ).toFixed(6)
   }
-   if (field == 'supplierCode') {
-      basicFormRef.value.formRef.formModel.supplierName = ''
-      const paramsCustomer = {
-        by: 'ASC',
-        filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }],
-        pageNo: 1,
-        pageSize: 500,
-        sort: ''
-      }
-      paramsCustomer.isSearch = true
-      SupplierApi.getSupplierPage(paramsCustomer).then((res) => {
-        if (res.list?.length > 0) {
-            basicFormRef.value.formRef.formModel.supplierName =  res.list[0].name
-        }
-      })
+  if (field == 'claimAmount') {
+    basicFormRef.value.formRef.formModel.summaryAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
+      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+    ).toFixed(6)
+    basicFormRef.value.formRef.formModel.remainingAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
+      parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
+    ).toFixed(6)
+  }
+
+  if (field == 'disbursementAmount') {
+    basicFormRef.value.formRef.formModel.remainingAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
+      parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
+    ).toFixed(6)
+  }
+
+  if (field == 'supplierCode') {
+    basicFormRef.value.formRef.formModel.supplierName = ''
+    const paramsCustomer = {
+      by: 'ASC',
+      filters: [
+        { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }
+      ],
+      pageNo: 1,
+      pageSize: 500,
+      sort: ''
     }
+    paramsCustomer.isSearch = true
+    SupplierApi.getSupplierPage(paramsCustomer).then((res) => {
+      if (res.list?.length > 0) {
+        basicFormRef.value.formRef.formModel.supplierName = res.list[0].name
+      }
+    })
+  }
 }
 
 // 字段设置 更新主列表字段
@@ -323,12 +447,20 @@ const handleFinish = async (id: number) => {
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
+  if(!row || !row.claimAmount){
+   nextTick(() => {
+      basicFormRef.value.formRef.setValues({
+        claimAmount: ''
+      })
+    })
+  }
   if (type == 'create') {
     nextTick(() => {
       basicFormRef.value.formRef.setValues({
         handleTime: new Date().getTime(),
         claimTime: new Date().getTime(),
-        priority: '3'
+        priority: '3',
+        disbursementAmount: 0
       })
     })
   }
@@ -346,16 +478,8 @@ const formsSuccess = async (formType, data) => {
       return
     }
   }
-  if (data.qty > data.wmsQty) {
-    message.error('数量不能大于记录中的收货数量')
-    return
-  }
-  if (data.qty == 0) {
-    message.error('数量不能为0')
-    return
-  }
-  if (data.claimAmount == 0) {
-    message.error('索赔金额不能为0')
+  if (data.lightQty == 0) {
+    message.error('整灯数量不能为0')
     return
   }
   if (data.activeTime == 0) data.activeTime = null
@@ -398,19 +522,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await Q2Api.exportQ2(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 342e3f3c9..2f1c9b16f 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -10,30 +10,33 @@ import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
-import * as SupplierApi from '@/api/wms/supplier'
-import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
 
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 
 // 表单校验
 export const Q2Rules = reactive({
-  number: [required],
-  supplierCode: [required],
-  itemCode: [required],
-  purchaseReceiptNumber: [required],
-  qty: [required],
-  code: [required],
-  priority: [required],
-  claimAmount: [required],
-  costCode: [required],
-  claimTime: [required],
-  handleTime: [required],
-  available: [required],
-  concurrencyStamp: [required]
+  itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }],
+  supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
+  purchaseReceiptNumber: [
+    { required: true, message: '请选择采购收货单号', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }],
+  lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }],
+  lightQty: [{ required: true, message: '请选择整灯数量', trigger: 'change' }],
+  code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }],
+  priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
+  claimMultiple: [{ required: true, message: '请选择索赔倍数', trigger: 'change' }],
+  claimAmount: [{ required: true, message: '请输入索赔金额', trigger: 'change' }],
+  costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }],
+  cashierEmail: [{ required: true, message: '请选择选择出纳邮件地址', trigger: 'change' }],
+  handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }]
 })
 
 export const Q2 = useCrudSchemas(
@@ -50,7 +53,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '供应商物料代码',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -72,6 +75,11 @@ export const Q2 = useCrudSchemas(
               key: 'available',
               value: 'TRUE',
               isMainValue: false
+            },
+            {
+              key: 'type',
+              value: 'Q2',
+              isMainValue: false
             }
           ],
           verificationParams: [
@@ -88,7 +96,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '供应商物料名称',
       field: 'itemName',
       sort: 'custom',
       dictClass: 'string',
@@ -97,6 +105,9 @@ export const Q2 = useCrudSchemas(
       tableForm: {
         disabled: true
       },
+      table: {
+        width: 150
+      },
       form: {
         componentProps: {
           disabled: true
@@ -113,6 +124,9 @@ export const Q2 = useCrudSchemas(
       tableForm: {
         disabled: true
       },
+      table: {
+        width: 120
+      },
       form: {
         component: 'Select',
         componentProps: {
@@ -132,6 +146,9 @@ export const Q2 = useCrudSchemas(
       dictClass: 'string',
       isSearch: false,
       isTable: true,
+      table: {
+        width: 180
+      },
       tableForm: {
         disabled: true
       },
@@ -152,14 +169,14 @@ export const Q2 = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch: true,
           disabled: true,
+          multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: '采购收货记录', // 查询弹窗标题
           searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需类
-          searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
+          searchPage: PurchasereceiptRecordDetailApi.pageForQ2, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'supplierCode',
@@ -171,17 +188,7 @@ export const Q2 = useCrudSchemas(
               value: 'itemCode',
               isMainValue: true
             }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
+          ]
         }
       }
     },
@@ -206,64 +213,73 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
-
     {
-      label: '数量',
-      field: 'qty',
+      label: '整灯物料代码',
+      field: 'lightItemCode',
       sort: 'custom',
-      isTable: true,
-      isSearch: false,
       table: {
         width: 150
       },
+      isSearch: true,
       form: {
-        component: 'InputNumber',
+        // labelMessage: '信息提示说明！！！',
         componentProps: {
-          min: 0,
-          precision: 2
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料基础信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'type',
+              value: 'CCP',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
     {
-      label: '单位',
-      field: 'uom',
+      label: '整灯物料名称',
+      field: 'lightItemName',
       sort: 'custom',
-      dictType: DICT_TYPE.UOM,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '标准成本价格',
-      field: 'standardCostPrice',
-      sort: 'custom',
-      isSearch: false,
       table: {
         width: 150
       },
+      tableForm: {
+        disabled: true
+      },
       form: {
-        component: 'InputNumber',
         componentProps: {
-          min: 0,
-          precision: 6,
           disabled: true
         }
       }
     },
     {
-      label: '索赔金额',
-      field: 'claimAmount',
+      label: '整灯数量',
+      field: 'lightQty',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
       isSearch: false,
       table: {
         width: 150
@@ -298,16 +314,72 @@ export const Q2 = useCrudSchemas(
       dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
       dictClass: 'string',
       isSearch: false,
-      isTable: false,
+      isTable: true,
       tableForm: {
         type: 'Select'
       }
     },
+    {
+      label: '索赔倍数',
+      field: 'claimMultiple',
+      sort: 'custom',
+      dictType: DICT_TYPE.QMS_CLAIM_MULTIPLE,
+      dictClass: 'string',
+      isTable: true,
+      isSearch: false,
+      table: {
+        width: 100
+      },
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {}
+      }
+    },
+    {
+      label: '标准成本价格',
+      field: 'standardCostPrice',
+      sort: 'custom',
+      isSearch: false,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6,
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '索赔金额',
+      field: 'claimAmount',
+      sort: 'custom',
+      isTable: true,
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6
+        }
+      }
+    },
+
     {
       label: '其他索赔描述',
       field: 'otherClaimDesc',
       sort: 'custom',
       isSearch: false,
+      isTable: true,
       table: {
         width: '150'
       },
@@ -321,6 +393,7 @@ export const Q2 = useCrudSchemas(
       field: 'otherclaimAmount',
       sort: 'custom',
       isSearch: false,
+      isTable: true,
       table: {
         width: 150
       },
@@ -328,7 +401,7 @@ export const Q2 = useCrudSchemas(
         component: 'InputNumber',
         componentProps: {
           min: 0,
-          precision: 6,
+          precision: 6
         }
       }
     },
@@ -337,6 +410,7 @@ export const Q2 = useCrudSchemas(
       field: 'summaryAmount',
       sort: 'custom',
       isSearch: false,
+      isTable: true,
       table: {
         width: 150
       },
@@ -350,32 +424,74 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '成本中心代码',
-      field: 'costCode',
+      label: '抛账金额',
+      field: 'disbursementAmount',
       sort: 'custom',
       isSearch: false,
-      isTable: false,
-      isForm: true,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6,
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '剩余金额',
+      field: 'remainingAmount',
+      sort: 'custom',
+      isSearch: false,
+      isTable: true,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6,
+          disabled: true
+        }
+      }
+    },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
+          multiple: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择成本中心', // 输入框占位文本
-          searchField: 'costcentreCode', // 查询弹窗赋值字段
-          searchTitle: '成本中心信息', // 查询弹窗标题
-          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
-          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
             }
           ],
           verificationParams: [
             {
-              key: 'costcentreCode',
+              key: 'number',
               action: '==',
               value: '',
               isMainValue: false,
@@ -384,41 +500,39 @@ export const Q2 = useCrudSchemas(
             }
           ] // 失去焦点校验参数
         }
-      }
+      },
+      isSearch: true
     },
     {
-      label: 'Q1通知单号',
-      field: 'q1Number',
+      label: '成本中心代码',
+      field: 'costCode',
       sort: 'custom',
+      isSearch: false,
+      isTable: true,
+      isForm: true,
       table: {
-        width: 150
+        width: '120'
       },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
-          multiple: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchListPlaceholder: '请选择成本中心', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心信息', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
             }
           ],
           verificationParams: [
             {
-              key: 'number',
+              key: 'costcentreCode',
               action: '==',
               value: '',
               isMainValue: false,
@@ -427,14 +541,29 @@ export const Q2 = useCrudSchemas(
             }
           ] // 失去焦点校验参数
         }
+      }
+    },
+    {
+      label: '出纳邮件地址',
+      field: 'cashierEmail',
+      sort: 'custom',
+      isSearch: false,
+      isTable: false,
+      table: {
+        width: '150'
       },
-      isSearch: true
+      form: {
+        component: 'Input',
+        componentProps: {}
+      }
     },
+
     {
       label: '负责用户',
       field: 'responUser',
       sort: 'custom',
       isSearch: false,
+      isTable: true,
       isForm: true,
       table: {
         width: 120
@@ -449,7 +578,7 @@ export const Q2 = useCrudSchemas(
     {
       label: '处理时间',
       field: 'handleTime',
-      isTable: false,
+      isTable: true,
       table: {
         width: 180
       },
@@ -475,6 +604,7 @@ export const Q2 = useCrudSchemas(
       dictType: DICT_TYPE.PUBLISHE_STATUS,
       dictClass: 'string',
       isForm: false,
+      isTable: true,
       isSearch: false,
       tableForm: {
         type: 'Select',
@@ -491,6 +621,7 @@ export const Q2 = useCrudSchemas(
       field: 'desc',
       sort: 'custom',
       isSearch: false,
+      isTable: true,
       table: {
         width: '150'
       },
@@ -514,6 +645,7 @@ export const Q2 = useCrudSchemas(
       label: '创建时间',
       field: 'createTime',
       isForm: false,
+      isTable: true,
       table: {
         width: 180
       },
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index e175ddfcc..a061d7ab9 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -110,6 +110,8 @@ import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { useUserStore } from '@/store/modules/user'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 const userStore = useUserStore()
 
 // 发料申请
@@ -358,19 +360,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionQ3MainApi.exportInspectionQ3Main(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index a7863738e..02199fe88 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -138,7 +138,8 @@ import {
 } from '../inspectionJob/inspectionJobMain.data'
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购订单
 defineOptions({ name: 'inspectionRecordMain' })
 
@@ -393,19 +394,18 @@ const execute = async (type: string, row?: number) => {
   basicFormRef.value.open(type, row)
 }
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 40dd39370..c8a82be69 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -2,10 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search :schema="InspectionRecordMain.allSchemas.searchSchema" @search="setSearchParams" 
-    @reset="setSearchParams({
-          available: true,
-      inspectionType:'11'
-        })"
+    @reset="setSearchParams"
       />
   </ContentWrap>
 
@@ -83,8 +80,8 @@ import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeat
 
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-  import {exportFirstInspectionRecordMain} from "@/api/qms/inspectionRecord/inspectionRecordMain";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
   // 采购订单
   defineOptions({ name: 'InspectionRecordMain' })
 
@@ -228,19 +225,18 @@ const checkQualityReport = async (row) => {
 
   
 /** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleMainExport = async (row: any) => {
   try {
     await message.exportConfirm()
       // 发起导出
-    exportLoading.value = true
+      loadStart()
     tableObject.params.number = row.number
     const excelTitle = ref(route.meta.title)
     const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -251,13 +247,13 @@ const handleMainExport = async (row: any) => {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
-    const excelTitle = ref(route.meta.title)
+      loadStart()
+      const excelTitle = ref(route.meta.title)
       const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
@@ -307,7 +303,7 @@ const searchFormClick = (searchData) => {
   /** 初始化 **/
 onMounted(async () => {
     tableObject.params = {
-      available: true,
+      available: 'TRUE',
       inspectionType:'11'
     }
     getList()
diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
index 59f1c6049..1d75b6b0d 100644
--- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
+++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
@@ -134,17 +134,17 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '包装号',
-      field: 'packageCode',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false,
-      tableForm: {
-        disabled: false
-      }
-    },
+    // {
+    //   label: '包装号',
+    //   field: 'packageCode',
+    //   sort: 'custom',
+    //   isSearch: false,
+    //   isTable: false,
+    //   isForm: false,
+    //   tableForm: {
+    //     disabled: false
+    //   }
+    // },
     {
       label: '发货单号',
       field: 'asnNumber',
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index 4e6ea8443..8e04131cb 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@@ -5,9 +5,7 @@
       <Search
         :schema="InspectionMain.allSchemas.searchSchema"
         @search="setSearchParams"
-        @reset="setSearchParams({
-          available: true
-        })"
+        @reset="setSearchParams"
       />
     </ContentWrap>
 
@@ -118,7 +116,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { formatDate } from '@/utils/formatTime'
 import { getReportUrl } from '@/utils/systemParam'
 // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'inspectionMain' })
 
 const message = useMessage() // 消息弹窗
@@ -437,19 +436,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionMainApi.exportInspectionMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -510,7 +508,7 @@ const ListTableSubmit = async (formType, data) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: 'TRUE'
   }
   getList()
   importTemplateData.templateUrl = await InspectionMainApi.importTemplate()
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index fec4ebfd9..bd233e050 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -84,7 +84,8 @@ import * as InspectionSchemeApi from '@/api/qms/inspectionScheme'
 import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
 import * as SampleCodeApi from '@/api/qms/sampleCode'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InspectionScheme' })
 
 const message = useMessage() // 消息弹窗
@@ -280,19 +281,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionSchemeApi.exportInspectionScheme(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionStage/index.vue b/src/views/qms/inspectionStage/index.vue
index ac7db008e..d5aa0b097 100644
--- a/src/views/qms/inspectionStage/index.vue
+++ b/src/views/qms/inspectionStage/index.vue
@@ -75,7 +75,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InspectionStage' })
 
 const message = useMessage() // 消息弹窗
@@ -220,18 +221,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await InspectionStageApi.exportInspectionStage(tableObject.params)
     download.excel(data, '检验阶段.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/inspectionTemplate/index.vue b/src/views/qms/inspectionTemplate/index.vue
index 38d59b1bf..708961e85 100644
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@@ -86,7 +86,8 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import AddForm from './addForm.vue'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'AgvLocationrelation' })
 
 const message = useMessage() // 消息弹窗
@@ -150,19 +151,18 @@ const buttonBaseClick = (val, item) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectionProcessPageApi.exportInspectionTemplate(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 29e986fb4..18204295e 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -80,7 +80,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SampleCode' })
 
 const message = useMessage() // 消息弹窗
@@ -273,19 +274,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SampleCodeApi.exportSampleCode(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 44795cfe0..a8baaf580 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -165,7 +165,7 @@ export const SampleCode = useCrudSchemas(
       sort: 'custom',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       formatter: dateFormatter,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -188,7 +188,7 @@ export const SampleCode = useCrudSchemas(
       field: 'updater',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       table: {
         width: 150
       }
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index fa87e3649..930106834 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -84,7 +84,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { validatePercent, validateInteger, validateTwoNum } from '@/utils/validator'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SamplingProcess' })
 
 const message = useMessage() // 消息弹窗
@@ -264,19 +265,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SamplingProcessApi.exportSamplingProcess(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index bc6adb003..41b030803 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -79,7 +79,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SamplingScheme' })
 
 const message = useMessage() // 消息弹窗
@@ -262,19 +263,18 @@ const handleDisable = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SamplingSchemeApi.exportSamplingScheme(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index 30edb172f..af0d71b9f 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -92,7 +92,7 @@ export const SamplingScheme = useCrudSchemas(
       sort: 'custom',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       formatter: dateFormatter,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -115,7 +115,7 @@ export const SamplingScheme = useCrudSchemas(
       field: 'updater',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       table: {
         width: 150
       }
diff --git a/src/views/qms/selectedProject/index.vue b/src/views/qms/selectedProject/index.vue
index 1e5442f4d..4b9b793bd 100644
--- a/src/views/qms/selectedProject/index.vue
+++ b/src/views/qms/selectedProject/index.vue
@@ -74,7 +74,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SelectedProject' })
 
 const message = useMessage() // 消息弹窗
@@ -219,18 +220,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SelectedProjectApi.exportSelectedProject(tableObject.params)
     download.excel(data, '选定集项目.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index d4ca5e698..632e19234 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -116,7 +116,8 @@ import { formatDate } from '@/utils/formatTime'
 // 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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SelectedSet' })
 
 const message = useMessage() // 消息弹窗
@@ -310,19 +311,18 @@ const handleDisable = async (id: number) => {
   } catch {}
 }
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SelectedSetApi.exportSelectedSet(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/report/printBusinesstypeTemplate/index.vue b/src/views/report/printBusinesstypeTemplate/index.vue
index 45b3b13ce..cb75c4f75 100644
--- a/src/views/report/printBusinesstypeTemplate/index.vue
+++ b/src/views/report/printBusinesstypeTemplate/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PrintBusinesstypeTemplate' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PrintBusinesstypeTemplateApi.exportPrintBusinesstypeTemplate(tableObject.params)
     download.excel(data, '打印服务业务类型和打印模板关系.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/report/printClientPrinter/index.vue b/src/views/report/printClientPrinter/index.vue
index 59c64000d..83e43bad8 100644
--- a/src/views/report/printClientPrinter/index.vue
+++ b/src/views/report/printClientPrinter/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PrintClientPrinter' })
 
 const message = useMessage() // 消息弹窗
@@ -198,18 +199,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PrintClientPrinterApi.exportPrintClientPrinter(tableObject.params)
     download.excel(data, '打印服务客户端与打印机名称关系.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue
index f07f1ae6a..ba691061a 100644
--- a/src/views/system/dict/data/index.vue
+++ b/src/views/system/dict/data/index.vue
@@ -122,7 +122,8 @@ import download from '@/utils/download'
 import * as DictDataApi from '@/api/system/dict/dict.data'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictDataForm from './DictDataForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemDictData' })
 
 const message = useMessage() // 消息弹窗
@@ -192,12 +193,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await DictDataApi.exportDictData(queryParams)
     download.excel(data, '字典数据.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 72255bf61..ec6f925a4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -101,7 +101,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictTypeForm from './DictTypeForm.vue'
 import download from '@/utils/download'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemDictType' })
 
 const message = useMessage() // 消息弹窗
@@ -170,12 +171,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await DictTypeApi.exportDictType(queryParams)
     download.excel(data, '字典类型.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue
index dac5240a0..5252159e2 100644
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@@ -86,7 +86,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ErrorCodeApi from '@/api/system/errorCode'
 import ErrorCodeForm from './ErrorCodeForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemErrorCode' })
 
 const message = useMessage() // 消息弹窗
@@ -155,12 +156,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ErrorCodeApi.excelErrorCode(queryParams)
     download.excel(data, '错误码.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
index 997fcef9d..4abaf895a 100644
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@@ -70,7 +70,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as LoginLogApi from '@/api/system/loginLog'
 import LoginLogDetail from './LoginLogDetail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemLoginLog' })
 
 const message = useMessage() // 消息弹窗
@@ -124,12 +125,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await LoginLogApi.exportLoginLog(queryParams)
     download.excel(data, '登录日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/messageSet/index.vue b/src/views/system/messageSet/index.vue
index 94ea11c87..a949cd91d 100644
--- a/src/views/system/messageSet/index.vue
+++ b/src/views/system/messageSet/index.vue
@@ -68,7 +68,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as TableActionRelApi from '@/api/system/tableActionRel'
 import { validateCode } from '@/utils/validator'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'MessageSet' })
 
 const message = useMessage() // 消息弹窗
@@ -212,12 +213,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MessageSetApi.exportMessageSet(tableObject.params)
     download.excel(data, '消息设置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
index 3bfd3d20e..41e7f41dc 100644
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@@ -87,7 +87,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as OperateLogApi from '@/api/system/operatelog'
 import OperateLogDetail from './OperateLogDetail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemOperateLog' })
 
 const message = useMessage() // 消息弹窗
@@ -143,12 +144,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await OperateLogApi.exportOperateLog(queryParams)
     download.excel(data, '操作日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 6c2ae14ce..a53b5ac4e 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -73,7 +73,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as PostApi from '@/api/system/post'
 import PostForm from './PostForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemPost' })
 
 const message = useMessage() // 消息弹窗
@@ -141,12 +142,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PostApi.exportPost(queryParams)
     download.excel(data, '岗位列表.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 22bc8f76a..d67333373 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -167,7 +167,8 @@ import * as RoleApi from '@/api/system/role'
 import RoleForm from './RoleForm.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemRole' })
 
 const message = useMessage() // 消息弹窗
@@ -248,12 +249,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await RoleApi.exportRole(queryParams)
     download.excel(data, '角色列表.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue
index e01a3be2a..c2c083388 100644
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@@ -97,7 +97,8 @@ import download from '@/utils/download'
 import * as SensitiveWordApi from '@/api/system/sensitiveWord'
 import SensitiveWordForm from './SensitiveWordForm.vue'
 import SensitiveWordTestForm from './SensitiveWordTestForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemSensitiveWord' })
 
 const message = useMessage() // 消息弹窗
@@ -173,12 +174,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SensitiveWordApi.exportSensitiveWord(queryParams)
     download.excel(data, '敏感词.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue
index 6eb5122c0..315469092 100644
--- a/src/views/system/serialNumber/index.vue
+++ b/src/views/system/serialNumber/index.vue
@@ -100,7 +100,8 @@ import download from '@/utils/download'
 import * as SerialNumberApi from '@/api/system/serialNumber'
 import SerialNumberForm from './SerialNumberForm.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 const route = useRoute() //路由信息
 
 defineOptions({ name: 'SerialNumber' })
@@ -169,13 +170,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SerialNumberApi.exportSerialNumber(queryParams)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
index bc7c3ff60..4d9c0504e 100644
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@@ -116,7 +116,8 @@ import download from '@/utils/download'
 import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import * as SmsLogApi from '@/api/system/sms/smsLog'
 import SmsLogDetail from './SmsLogDetail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemSmsLog' })
 
 const message = useMessage() // 消息弹窗
@@ -169,12 +170,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SmsLogApi.exportSmsLog(queryParams)
     download.excel(data, '短信日志.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
index b9e478c60..99198b0ba 100644
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@@ -116,7 +116,8 @@ import * as SmsChannelApi from '@/api/system/sms/smsChannel'
 import download from '@/utils/download'
 import SmsTemplateForm from './SmsTemplateForm.vue'
 import SmsTemplateSendForm from './SmsTemplateSendForm.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemSmsTemplate' })
 
 const message = useMessage() // 消息弹窗
@@ -195,12 +196,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SmsTemplateApi.exportSmsTemplate(queryParams)
     download.excel(data, '短信模板.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/tableActionRel/index.vue b/src/views/system/tableActionRel/index.vue
index 10f7d8370..916265e22 100644
--- a/src/views/system/tableActionRel/index.vue
+++ b/src/views/system/tableActionRel/index.vue
@@ -67,6 +67,8 @@ 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 { getStrDictOptions } from '@/utils/dict'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'TableActionRel' })
 
 const message = useMessage() // 消息弹窗
@@ -202,18 +204,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await TableActionRelApi.exportTableActionRel(tableObject.params)
     download.excel(data, '表名动作关系.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 7e61bb6da..8cba27a37 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -105,6 +105,8 @@ import * as TenantApi from '@/api/system/tenant'
 import * as TenantPackageApi from '@/api/system/tenantPackage'
 import TenantForm from './TenantForm.vue'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 const route = useRoute() //路由信息
 
 defineOptions({ name: 'SystemTenant' })
@@ -177,13 +179,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TenantApi.exportTenant(queryParams)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 541a7f3ef..bba0aa3e6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -113,7 +113,8 @@ import UserImportForm from './UserImportForm.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import UserAssignRoleForm from './UserAssignRoleForm.vue'
 import DeptTree from './DeptTree.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SystemUser' })
 
 const message = useMessage() // 消息弹窗
@@ -204,12 +205,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await UserApi.exportUser(queryParams)
     download.excel(data, '用户数据.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue
index db76421b9..e10115293 100644
--- a/src/views/wms/agvManage/agvLocationrelation/index.vue
+++ b/src/views/wms/agvManage/agvLocationrelation/index.vue
@@ -70,7 +70,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'AgvLocationrelation' })
 
 const message = useMessage() // 消息弹窗
@@ -236,19 +237,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/agvManage/interfaceInfo/index.vue b/src/views/wms/agvManage/interfaceInfo/index.vue
index 5839696e8..0e89c5afb 100644
--- a/src/views/wms/agvManage/interfaceInfo/index.vue
+++ b/src/views/wms/agvManage/interfaceInfo/index.vue
@@ -76,7 +76,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 接口调用信息
 defineOptions({ name: 'InterfaceInfo' })
 
@@ -208,18 +209,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await InterfaceInfoApi.exportInterfaceInfo(tableObject.params)
     download.excel(data, '接口调用信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue
index 23fcf495a..ee7cccf37 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue
@@ -68,7 +68,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Customer' })
 
 const message = useMessage() // 消息弹窗
@@ -225,20 +226,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerApi.exportCustomer(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
index 0bb428760..5e5e7d155 100644
--- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'CustomerDeliveryForecast' })
 
 const message = useMessage() // 消息弹窗
@@ -214,19 +215,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerDeliveryForecastApi.exportCustomerDeliveryForecast(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
index 3bdbcf2ff..eed1bd1e9 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Customerdock' })
 
 const message = useMessage() // 消息弹窗
@@ -240,19 +241,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerdockApi.exportCustomerdock(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
index a59fa6b00..40ea29d56 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -72,7 +72,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Customeritem' })
 
 const message = useMessage() // 消息弹窗
@@ -264,19 +265,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomeritemApi.exportCustomeritem(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index b60be4717..5983cbefe 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Project' })
 
 const message = useMessage() // 消息弹窗
@@ -234,19 +235,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProjectApi.exportProject(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
index a45e1a2cd..824a050df 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Saleprice' })
 
 const message = useMessage() // 消息弹窗
@@ -238,19 +239,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SalepriceApi.exportSaleprice(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index a6798da74..6186113ba 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -79,7 +79,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 业务类型
 defineOptions({ name: 'Businesstype' })
 
@@ -358,19 +359,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BusinesstypeApi.exportBusinesstype(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
index 18fd3b68a..d6c1d0d28 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Documentsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -206,19 +207,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
index 306554ccc..6818d5e66 100644
--- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Jobsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -206,19 +207,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await JobsettingApi.exportJobsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
index 64da5858f..80f505ba0 100644
--- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Plansetting' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PlansettingApi.exportPlansetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
index d3c053c8b..4835f48cd 100644
--- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Recordsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RecordsettingApi.exportRecordsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
index 0d3e95826..1a870feeb 100644
--- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Requestsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RequestsettingApi.exportRequestsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
index 32f44e8eb..7084363e1 100644
--- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Switch' })
 
 const message = useMessage() // 消息弹窗
@@ -182,19 +183,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SwitchApi.exportSwitch(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
index 0a93285fa..2db81a820 100644
--- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Transactiontype' })
 
 const message = useMessage() // 消息弹窗
@@ -208,19 +209,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransactiontypeApi.exportTransactiontype(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 590d01593..ee896d96d 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -69,7 +69,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Area' })
 
 const message = useMessage() // 消息弹窗
@@ -240,19 +241,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await AreaApi.exportArea(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
index 6e0678669..61fe79c53 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -71,7 +71,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Dock' })
 
 const message = useMessage() // 消息弹窗
@@ -254,19 +255,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DockApi.exportDock(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
index c9a0f1bd6..057d48313 100644
--- a/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
@@ -60,7 +60,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Enterprise' })
 
 const message = useMessage() // 消息弹窗
@@ -222,19 +223,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await EnterpriseApi.exportEnterprise(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index bb66c4f51..67ad98430 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 基础信息——库位
 defineOptions({ name: 'Location' })
 
@@ -258,19 +259,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await LocationApi.exportLocation(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
index e67899ff0..a68c87e05 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库位组管理
 defineOptions({ name: 'Locationgroup' })
 
@@ -239,19 +240,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await LocationgroupApi.exportLocationgroup(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index aa303e210..aabae0d63 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Process' })
 
 const message = useMessage() // 消息弹窗
@@ -246,19 +247,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProcessApi.exportProcess(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index e64470322..5880c4db2 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产线管理
 defineOptions({ name: 'Productionline' })
 
@@ -239,19 +240,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionlineApi.exportProductionline(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
index b5906b5e9..308b558b2 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Warehouse' })
 
 const message = useMessage() // 消息弹窗
@@ -219,19 +220,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await WarehouseApi.exportWarehouse(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
index a69cc1591..2be522be7 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Workshop' })
 
 const message = useMessage() // 消息弹窗
@@ -221,19 +222,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await WorkshopApi.exportWorkshop(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 3fb62c9fe..74b7ce79e 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 工位管理
 defineOptions({ name: 'Workstation' })
 
@@ -248,19 +249,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await WorkstationApi.exportWorkstation(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue
index ba444db7b..97e7a07b0 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue
@@ -69,7 +69,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 物料清单bom
 defineOptions({ name: 'Bom' })
 
@@ -251,19 +252,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BomApi.exportBom(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index 0cd25ee3b..ffb66ec45 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -98,7 +98,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
   import Detail from '@/components/Detail/src/Detail.vue' 
   import { formatDate } from '@/utils/formatTime'
-
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
 // 发货申请
 // 物料库区配置管理
 defineOptions({ name: 'Itemarea' })
@@ -328,19 +329,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ItemareaApi.exportItemarea(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
index 63bf41417..4ec41f541 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue
@@ -89,7 +89,8 @@ import * as ExpectinApi from '@/api/wms/expectin'
 
 
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 //物料基础信息
 defineOptions({ name: 'Itembasic' })
@@ -285,13 +286,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ItembasicApi.exportItembasic(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 4015173db..63ee7af60 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -82,7 +82,8 @@ import { Itembasic } from '../itembasic/itembasic.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Packageunit } from '../packageunit/packageunit.data'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Itempackaging' })
 
 const message = useMessage() // 消息弹窗
@@ -318,19 +319,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ItempackagingApi.exportItempackaging(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
index 29bb8bc92..608621e1d 100644
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -68,7 +68,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Itemwarehouse' })
 
 const message = useMessage() // 消息弹窗
@@ -222,19 +223,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
index 851be23b8..ac659b85d 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Packageunit' })
 
 const message = useMessage() // 消息弹窗
@@ -263,19 +264,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageunitApi.exportPackageunit(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
index ba6958905..7063d47a2 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ProductionitemcodeSpareitemcode' })
 
 const message = useMessage() // 消息弹窗
@@ -232,19 +233,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionitemcodeSpareitemcodeApi.exportProductionitemcodeSpareitemcode(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
index 95378bdd7..7c0bfd7df 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 //生产线物料关系管理
 defineOptions({ name: 'Productionlineitem' })
 
@@ -244,13 +245,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
index da7e3af79..bc6351969 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
@@ -82,7 +82,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'RelegateRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -227,19 +228,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RelegateRecordMainApi.exportRelegateRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 9d468a5d3..4e1b6747a 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -43,6 +43,7 @@
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton=isShowButton />
@@ -100,7 +101,9 @@ import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+// 物料变更申请
 defineOptions({ name: 'RelegateRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -170,7 +173,9 @@ const handlePoint = async (row) => {
     message.warning('请先创建标签')
   }
 }
-
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -708,19 +713,18 @@ const handleDeleteTable = (item, index) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RelegateRequestMainApi.exportRelegateRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
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 5241b48fd..e2ec64bb6 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -106,7 +106,10 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -119,7 +122,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     isForm: false,
-    isTable: true
+    isTable: false
   },
   {
     label: '扩展属性',
@@ -374,7 +377,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'changeBeforeCode',
           value: 'itemCode',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         }],
         verificationParams: [{
@@ -402,7 +405,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'changeBeforeCode',
           value: 'itemCode',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         }]
     },
@@ -603,25 +606,47 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isTable:false,
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     isForm:false,
     isTableForm: false,
-    isTable:false,
+    isTable:true,
   },
   {
     label: '状态',
@@ -814,4 +839,4 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const RelegateRequestDetailLabelRules = reactive({
 
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
index 91f036856..0fc1f8cb6 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
@@ -68,7 +68,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 标准成本价格单
 defineOptions({ name: 'Stdcostprice' })
 
@@ -231,19 +232,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await StdcostpriceApi.exportStdcostprice(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
index 4505faf86..139231a87 100644
--- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue
@@ -66,7 +66,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Barbasic' })
 
 const message = useMessage() // 消息弹窗
@@ -191,18 +192,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
     download.excel(data, '条码实体基类.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
index e54fc5805..b2ccdfaf4 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Barcode' })
 
 const message = useMessage() // 消息弹窗
@@ -211,19 +212,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BarcodeApi.exportBarcode(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 1d16da2e8..9019dbc6c 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -80,6 +80,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 叫料标签
 defineOptions({ name: 'Callmaterials' })
 
@@ -283,19 +285,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 
 }
diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
index ae1e548e7..3a8d47290 100644
--- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue
@@ -63,7 +63,8 @@ import * as LabeltypeApi from '@/api/wms/labeltype'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Labeltype' })
 
 const message = useMessage() // 消息弹窗
@@ -221,18 +222,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await LabeltypeApi.exportLabeltype(tableObject.params)
     download.excel(data, '标签定义.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index 5a1acb4e2..e15d3f207 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -55,7 +55,8 @@ import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackaging'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库位标签
 defineOptions({ name: 'LocationLabel' })
 
@@ -170,19 +171,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index 17cb43b00..0247f00e0 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -68,7 +68,8 @@ import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
 
@@ -239,19 +240,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 15c3d7362..4d90e8bbf 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -69,7 +69,8 @@ import { formatTime } from '@/utils/index'
 import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
 
@@ -240,19 +241,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index 5384a4054..8fc6390f6 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -65,7 +65,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 器具标签
 defineOptions({ name: 'UtensilPackage' })
 
@@ -222,19 +223,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index 79d96bdb5..d5948afae 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Carrier' })
 
 const message = useMessage() // 消息弹窗
@@ -226,19 +227,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CarrierApi.exportCarrier(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index f20387be5..7d9e7ab4c 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Owner' })
 
 const message = useMessage() // 消息弹窗
@@ -227,19 +228,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await OwnerApi.exportOwner(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index 22878a2e9..3980d5577 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Shift' })
 
 const message = useMessage() // 消息弹窗
@@ -233,19 +234,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ShiftApi.exportShift(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index cc08b49d7..102177447 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -69,7 +69,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Team' })
 
 const message = useMessage() // 消息弹窗
@@ -221,19 +222,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TeamApi.exportTeam(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/condition/index.vue b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
index a6baf7f12..fe01c9e46 100644
--- a/src/views/wms/basicDataManage/strategySetting/condition/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/condition/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Condition' })
 
 const message = useMessage() // 消息弹窗
@@ -172,18 +173,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ConditionApi.exportCondition(tableObject.params)
     download.excel(data, '条件.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
index 05ad656fe..4207641fd 100644
--- a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Configuration' })
 
 const message = useMessage() // 消息弹窗
@@ -172,18 +173,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ConfigurationApi.exportConfiguration(tableObject.params)
     download.excel(data, '配置.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 78b516934..97c9e7e17 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -76,7 +76,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Configurationsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -203,19 +204,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index faab50e6a..f4de1748c 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Paramsetting' })
 
 const message = useMessage() // 消息弹窗
@@ -174,19 +175,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ParamsettingApi.exportParamsetting(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
index ba6e8bddc..6ed2a8dcc 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -75,7 +75,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Rule' })
 
 const message = useMessage() // 消息弹窗
@@ -206,19 +207,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RuleApi.exportRule(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index ed8ffd727..05dda56b9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -305,12 +305,19 @@
                     :key="'库存事务Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="库存事务Value"
+                <!-- <el-input key="库存事务Value"
                   v-model="item.Value"
                   placeholder="请输入库存事务，多个库存事务以逗号分隔"
                   clearable
                   style="flex: 1"
-                />
+                /> -->
+                <el-input key="库存事务Value" style="flex:1" placeholder="请选择库存事务" disabled v-model="item.Value" @blur="blurTransactionType">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactionType">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -337,7 +344,7 @@
 
 
                 <!-- 仓库 -->
-                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode">
+                <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -346,7 +353,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -356,7 +363,7 @@
 
                   
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -365,7 +372,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -639,6 +646,11 @@ import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { isString } from '@/utils/is'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as TransactiontypeApi from '@/api/wms/transactiontype'
+import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
+
+
+
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -674,7 +686,7 @@ const formData = ref({
     // 存储类型
     { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
     // 库存事务
-    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
   ],
   configuration: {
     // 仓库代码
@@ -904,8 +916,110 @@ const filterMethodWarehouseList = (query: string) => {
 
 
 const searchTableRef = ref()
-const searchWarehouse = ()=>{
 
+const blurWarehouse = async ()=>{
+  // 校验的值
+  let warehouseValue = formData.value.configuration[warehouseType.value]
+  if(!warehouseValue){
+    return
+  }
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    let verifyRes = await WarehouseApi.verifyWarehouse({
+      code:warehouseValue
+    })
+    console.log('仓库verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'AreaCode'){
+    // 库区
+    let verifyRes = await AreaApi.verifyAreaList({
+      code:warehouseValue
+    })
+    console.log('库区verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    // 库位组
+    let verifyRes = await LocationgroupApi.verifyLocationgroup({
+      code:warehouseValue
+    })
+    console.log('库位组verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+
+  }else if(warehouseType.value == 'LocationCode'){
+    // 库位
+    let verifyRes = await LocationApi.verifyLocation({
+      code:warehouseValue
+    })
+    console.log('库位组verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }
+
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+
+}
+//事务类型
+const searchTransactionType = ()=>{
+  searchTableRef.value.open(
+    '请选择事务类型',
+    Transactiontype.allSchemas,
+    TransactiontypeApi.getTransactiontypePage,
+    'TransactionType',
+    'code',
+    true,
+    undefined,
+    undefined,
+    undefined
+  )
+}
+// 失去焦点校验
+const blurTransactionType = async ()=>{
+  let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  if(transactionType&&transactionType.Value){
+    let verifyRes = await TransactiontypeApi.verifyTransactiontype({
+      code:transactionType.Value
+    })
+    console.log('事务类型verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = transactionType.Value.split(',')
+      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      transactionType.Value = ''
+    }
+  }
+}
+
+
+const searchWarehouse = ()=>{
 
   if(warehouseType.value == 'WarehouseCode'){
     // 仓库
@@ -964,6 +1078,13 @@ const searchWarehouse = ()=>{
   
 }
 const searchTableSuccess = (formField, searchField, val, type, row) => {
+  if(formField=='TransactionType'){
+    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+    if(transactionType){
+      transactionType.Value = val.map(item=>(item['code'])).join(',')
+    }
+    return
+  }
   // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
   console.log('searchTableSuccess',formField, searchField, val, type, row)
   console.log(val.map(item=>(item['code'])).join(','))
@@ -1025,7 +1146,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
             item.Value = item.Value.split(',')
           }
         })
@@ -1080,7 +1201,8 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
-
+  await blurWarehouse()
+  await blurTransactionType()
   console.log('规则条件',formData.value.condition)
   
   // 校验表单
@@ -1159,7 +1281,7 @@ const resetForm = () => {
       // 存储类型
       { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
       // 库存事务
-      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
     ],
 
     configuration: {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 3923999a7..4cc04b55e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -287,12 +287,19 @@
                     :key="'库存事务Operator'+cur.value"
                   />
                 </el-select>
-                <el-input key="库存事务Value"
+                <!-- <el-input key="库存事务Value"
                   v-model="item.Value"
                   placeholder="请输入库存事务，多个库存事务以逗号分隔"
                   clearable
                   style="flex: 1"
-                />
+                /> -->
+                <el-input key="库存事务Value" style="flex:1" placeholder="请选择库存事务" disabled v-model="item.Value" @blur="blurTransactionType">
+                    <template #suffix>
+                      <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchTransactionType">
+                        <Icon icon="ep:search" class="mr-5px" /> 
+                      </el-button> 
+                    </template>
+                  </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -331,7 +338,7 @@
                   
 
                   <!-- 仓库 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" v-model="formData.configuration.WarehouseCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -340,7 +347,7 @@
                   </el-input>
 
                   <!-- 库区 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'AreaCode'" placeholder="请选择库区" v-model="formData.configuration.AreaCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -349,7 +356,7 @@
                   </el-input>
 
                   <!-- 库位组 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" v-model="formData.configuration.LocationGroupCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -358,7 +365,7 @@
                   </el-input>
 
                   <!-- 库位 -->
-                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode">
+                  <el-input style="flex:1" v-show="warehouseType == 'LocationCode'" placeholder="请选择库位" v-model="formData.configuration.LocationCode" @blur="blurWarehouse">
                     <template #suffix>
                       <el-button type="text" plain style="color:var(--el-button-text-color)" @click="searchWarehouse">
                         <Icon icon="ep:search" class="mr-5px" /> 
@@ -583,6 +590,8 @@ import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { isString } from '@/utils/is'
+import * as TransactiontypeApi from '@/api/wms/transactiontype'
+import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -619,7 +628,7 @@ const formData = ref({
     // 存储类型
     { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
     // 库存事务
-    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
   ],
   configuration: {
     // 仓库代码
@@ -883,10 +892,119 @@ const searchWarehouse = ()=>{
   }
   
 }
+const blurWarehouse = async ()=>{
+  // 校验的值
+  let warehouseValue = formData.value.configuration[warehouseType.value]
+  if(!warehouseValue){
+    return
+  }
+  if(warehouseType.value == 'WarehouseCode'){
+    // 仓库
+    let verifyRes = await WarehouseApi.verifyWarehouse({
+      code:warehouseValue
+    })
+    console.log('仓库verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      // formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',')
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'AreaCode'){
+    // 库区
+    let verifyRes = await AreaApi.verifyAreaList({
+      code:warehouseValue
+    })
+    console.log('库区verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }else if(warehouseType.value == 'LocationGroupCode'){
+    // 库位组
+    let verifyRes = await LocationgroupApi.verifyLocationgroup({
+      code:warehouseValue
+    })
+    console.log('库位组verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+
+  }else if(warehouseType.value == 'LocationCode'){
+    // 库位
+    let verifyRes = await LocationApi.verifyLocation({
+      code:warehouseValue
+    })
+    console.log('库位verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = formData.value.configuration[warehouseType.value].split(',')
+      formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      formData.value.configuration[warehouseType.value] = ''
+    }
+  }
+
+  let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
+  fields.forEach(item=>{
+    if(item!=warehouseType.value){
+      formData.value.configuration[item] = ''
+    }
+  })
+
+}
+//事务类型
+const searchTransactionType = ()=>{
+  searchTableRef.value.open(
+    '请选择事务类型',
+    Transactiontype.allSchemas,
+    TransactiontypeApi.getTransactiontypePage,
+    'TransactionType',
+    'code',
+    true,
+    undefined,
+    undefined,
+    undefined
+  )
+}
+// 失去焦点校验
+const blurTransactionType = async ()=>{
+  let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+  console.log('transactionType',transactionType)
+  if(transactionType&&transactionType.Value){
+    let verifyRes = await TransactiontypeApi.verifyTransactiontype({
+      code:transactionType.Value
+    })
+    console.log('事务类型verifyRes',verifyRes)
+    if(verifyRes&&verifyRes.length>0){
+      let verifyList = verifyRes.map(item=>(item['code']))
+      let codeList = transactionType.Value.split(',')
+      transactionType.Value = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',')
+    }else{
+      transactionType.Value = ''
+    }
+  }
+}
 const searchTableSuccess = (formField, searchField, val, type, row) => {
   // let searchTableTitle  =  warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':''
   console.log('searchTableSuccess',formField, searchField, val, type, row)
   console.log(val.map(item=>(item['code'])).join(','))
+  if(formField=='TransactionType'){
+    let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType')
+    if(transactionType){
+      transactionType.Value = val.map(item=>(item['code'])).join(',')
+    }
+    return
+  }
   formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',')
   let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode']
   fields.forEach(item=>{
@@ -949,7 +1067,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
         formData.value.condition.forEach((item, index) => {
-          if (item.Operator == 'IN' || item.Operator == 'NOT IN') {
+          if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) {
             item.Value = item.Value.split(',')
           }
         })
@@ -1008,6 +1126,8 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  await blurWarehouse()
+  await blurTransactionType()
   if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){
     // 仓库
     message.error('请选择仓库')
@@ -1026,6 +1146,7 @@ const submitForm = async () => {
     message.error('请选择库位')
     return
   }
+  
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
@@ -1102,7 +1223,7 @@ const resetForm = () => {
       // 存储类型
       { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
       // 库存事务
-      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }
     ],
     configuration: {
       // 仓库代码
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 27be15c7c..571814a5b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -45,6 +45,16 @@
     <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
       @pagination="getList" />
   </ContentWrap>
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/supplierdeliver-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
   <!-- 表单弹窗：添加/修改 -->
   <AddForm ref="formRef" @success="getList" />
 </template>
@@ -54,7 +64,10 @@ import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
-
+import download from '@/utils/download'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplieDeliveryStrategy' })
 const queryFormRef = ref() // 搜索的表单
 
@@ -111,11 +124,7 @@ const handleDelete = async (id: number) => {
     getList()
   } catch { }
 }
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
-]
-
+const route = useRoute() // 路由信息
 
 
 // 头部按钮事件 
@@ -143,6 +152,48 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  console.log('queryParams',queryParams)
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(
+      queryParams
+    )
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
+  // defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出
+
+]
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue
index 21ef6c458..616377da4 100644
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Mstr' })
 
 const message = useMessage() // 消息弹窗
@@ -205,19 +206,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await MstrApi.exportMstr(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
index 793648000..2a5af579d 100644
--- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QadCostcentre' })
 
 const message = useMessage() // 消息弹窗
@@ -214,19 +215,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await QadCostcentreApi.exportQadCostcentre(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts
index 1278bf90a..7783cebfb 100644
--- a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts
+++ b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts
@@ -89,6 +89,7 @@ export const QadCostcentre = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue
index b8d2103cb..32539d6a4 100644
--- a/src/views/wms/basicDataManage/subject/qadProject/index.vue
+++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QadProject' })
 
 const message = useMessage() // 消息弹窗
@@ -214,19 +215,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await QadProjectApi.exportQadProject(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts
index 9191d3ffc..c04e55f5f 100644
--- a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts
+++ b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts
@@ -107,7 +107,7 @@ export const QadProject = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
index 73739b5ad..659efc5b8 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SubjectAccount' })
 
 const message = useMessage() // 消息弹窗
@@ -223,19 +224,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SubjectAccountApi.exportSubjectAccount(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
index e0b869549..1aaccbe82 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -68,7 +68,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Purchaseprice' })
 
 const message = useMessage() // 消息弹窗
@@ -238,13 +239,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasepriceApi.exportPurchasepriceSCP(tableObject.params)
@@ -255,7 +255,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
index a599ee3f0..0edf1afcd 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Supplier' })
 
 const message = useMessage() // 消息弹窗
@@ -220,13 +221,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     if(routeName.value.includes('SCP')){
       const data = await SupplierApi.exportSupplierSCP(tableObject.params)
     download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
@@ -236,7 +236,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
index e4db35496..506c82209 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue
@@ -81,6 +81,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 要货预测周期管理
 defineOptions({ name: 'SupplierCycle' })
 
@@ -229,19 +231,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierCycleApi.exportSupplierCycle(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 486c73b79..38854bac7 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Supplieritem' })
 
 const message = useMessage() // 消息弹窗
@@ -253,13 +254,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await SupplieritemApi.exportSupplieritemSCP(tableObject.params)
@@ -270,7 +270,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
index dd8b5506a..2343429a6 100644
--- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Accountcalendar' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 2d14a2eed..5feaff41b 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -67,7 +67,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Currencyexchange' })
 
 const message = useMessage() // 消息弹窗
@@ -208,19 +209,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index c54af273d..862db6be2 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -75,6 +75,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 供应商用户关联管理
 defineOptions({ name: 'SupplierUser' })
 
@@ -214,21 +216,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
-    tableObject.loading = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierUserApi.exportSupplierUser(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
-    tableObject.loading = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index e0444e796..e41a66b38 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Systemcalendar' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index b2fdfcccf..35f970327 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -74,7 +74,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'MesBarCode' })
 
@@ -216,19 +217,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await MesBarCodeApi.exportMesBarCode(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index c3e6d59aa..a00cc0ced 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -100,6 +100,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
 
@@ -341,19 +343,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -361,14 +362,14 @@ const handleExport = async () => {
 const handleExportCountJob = async (id: number, number: string) => {
   try {
     await message.exportConfirm()
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountJobMainApi.handleExportCountJob(id)
     // download.excel(data, '盘点任务主'+number+'.xlsx')
     download.excel(data, `【${excelTitle.value}${number}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 875b66924..78d3af8d5 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -145,7 +145,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点计划主
 defineOptions({ name: 'CountPlanMain' })
 
@@ -645,19 +646,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountPlanMainApi.exportCountPlanMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue
index 88ae6448c..a3a7ae8f5 100644
--- a/src/views/wms/countManage/count/countRecordMain/index.vue
+++ b/src/views/wms/countManage/count/countRecordMain/index.vue
@@ -68,6 +68,8 @@ import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点记录主
 defineOptions({ name: 'CountRecordMain' })
 
@@ -159,19 +161,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountRecordMainApi.exportCountRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 4a90f6378..9c4a60078 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -115,7 +115,8 @@ import * as CountRequestDetailApi from '@/api/wms/countRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { SearchTableCount } from '@/components/SearchTableCount'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点申请
 defineOptions({ name: 'CountRequestMain' })
 
@@ -494,19 +495,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountRequestMainApi.exportCountRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
index 1d3ed4146..0dae8fcac 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
@@ -68,6 +68,8 @@ import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点调整记录主
 defineOptions({ name: 'CountadjustRecordMain' })
 
@@ -145,19 +147,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountadjustRecordMainApi.exportCountadjustRecordMain(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index dd89dd566..3fc7452a7 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -88,7 +88,8 @@ import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
 import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 盘点调整申请
 defineOptions({ name: 'CountadjustRequestMain' })
 
@@ -314,19 +315,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CountadjustRequestMainApi.exportCountadjustRequestMain(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
index 32c468e96..e0315a3ec 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户收货记录主
 defineOptions({ name: 'CustomerreceiptRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerreceiptRecordMainApi.exportCustomerreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index cb112ac36..17a6c169c 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -89,7 +89,8 @@ import * as CustomerreceiptRequestMainApi from '@/api/wms/customerreceiptRequest
 import * as CustomerreceiptRequestDetailApi from '@/api/wms/customerreceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户收货申请
 defineOptions({ name: 'CustomerreceiptRequestMain' })
 
@@ -319,19 +320,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerreceiptRequestMainApi.exportCustomerreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index 53ff33579..090d03149 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -612,7 +612,7 @@ export const CustomerreturnJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -621,15 +621,6 @@ export const CustomerreturnJobMain = useCrudSchemas(
           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: '创建者',
@@ -638,7 +629,7 @@ export const CustomerreturnJobMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: true
+      isTable: false
     },
     {
       label: '最后更新时间',
@@ -955,7 +946,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -964,6 +955,15 @@ export const CustomerreturnJobDetail = 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: '创建者',
@@ -972,7 +972,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
 ]))
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
index 10cff8f27..2bebcf828 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -74,6 +74,8 @@ import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
 
@@ -358,19 +360,18 @@ const handleHandle = async (data) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerreturnJobMainApi.exportCustomerreturnJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
index 400ca9f5b..0543f330c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
@@ -71,6 +71,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
 
@@ -155,19 +157,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerreturnRecordMainApi.exportCustomerreturnRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 376ff1484..b2c49ad62 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -117,6 +117,8 @@ import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户退货申请
 defineOptions({ name: 'CustomerreturnRequestMain' })
 
@@ -646,19 +648,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomerreturnRequestMainApi.exportCustomerreturnRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
index 18d8288dc..284cdd51f 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户结算记录主
 defineOptions({ name: 'CustomersettleRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomersettleRecordMainApi.exportCustomersettleRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
index 748d49b20..c79426859 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@@ -90,7 +90,8 @@ import * as CustomersettleRequestMainApi from '@/api/wms/customersettleRequestMa
 import * as CustomersettleRequestDetailApi from '@/api/wms/customersettleRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 客户结算申请
 defineOptions({ name: 'CustomersettleRequestMain' })
 
@@ -330,19 +331,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await CustomersettleRequestMainApi.exportCustomersettleRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index cf585acbb..0eb87c4c6 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -575,7 +575,7 @@ export const DeliverJobMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -584,7 +584,7 @@ export const DeliverJobMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isSearch: true,
+      isSearch: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -601,7 +601,7 @@ export const DeliverJobMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: true
+      isTable: false
     },
     {
       label: '最后更新时间',
@@ -894,7 +894,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -903,6 +903,15 @@ export const DeliverJobDetail = 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: '创建者',
@@ -911,7 +920,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
 ]))
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 39845108a..42ceaed89 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -74,6 +74,8 @@ import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发货任务主
 defineOptions({ name: 'DeliverJobMain' })
 
@@ -343,19 +345,18 @@ const handleHandle = async (data) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DeliverJobMainApi.exportDeliverJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index 368a74cbc..9621df6bb 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -71,6 +71,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发货记录主
 defineOptions({ name: 'DeliverRecordMain' })
 
@@ -177,19 +179,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DeliverRecordMainApi.exportDeliverRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 822e0610a..026f47b5e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -96,7 +96,8 @@ import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as AreabasicApi from '@/api/wms/areabasic'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发货申请
 defineOptions({ name: 'DeliverRequestMain' })
 
@@ -467,13 +468,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'DeliverRequestMain'){
       const data = await DeliverRequestMainApi.exportDeliverRequestMain(tableObject.params)
@@ -484,7 +484,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 65deef6fc..02d7c6911 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -88,7 +88,8 @@ import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as AreabasicApi from '@/api/wms/areabasic'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发货计划
 defineOptions({ name: 'DeliverPlanMain' })
 
@@ -426,13 +427,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'DeliverRequestMain'){
       const data = await DeliverPlanMainApi.exportDeliverPlanMain(tableObject.params)
@@ -443,7 +443,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
index b24e9156f..de7788fe2 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@@ -85,7 +85,8 @@ import * as SaleMainApi from '@/api/wms/saleMain'
 import * as SaleDetailApi from '@/api/wms/saleDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 销售订单主
 defineOptions({ name: 'SaleMain' })
 
@@ -246,19 +247,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SaleMainApi.exportSaleMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index 3b7d011af..9509e5a9b 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -73,7 +73,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SaleShipmentMainRecord' })
 
 const message = useMessage() // 消息弹窗
@@ -199,19 +200,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index 0394c60c6..9c9b9e88b 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -91,6 +91,8 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isTable:false
   },
   {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 9b49ddef3..9d3345549 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -94,6 +94,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SaleShipmentMain' })
 
 const message = useMessage() // 消息弹窗
@@ -440,19 +442,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SaleShipmentMainApi.exportSaleShipmentMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 57b119bc7..e27f39d42 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -77,7 +77,8 @@ import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货任务主
 defineOptions({ name: 'StockupJobMain' })
 
@@ -232,19 +233,18 @@ const handleHandle = async (data) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await StockupJobMainApi.exportStockupMainJob(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index de4cf0d62..fec5b97f8 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -69,7 +69,8 @@ import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货记录主
 defineOptions({ name: 'StockupMainRecord' })
 
@@ -150,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await StockupMainRecordApi.exportStockupMainRecord(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index bf0fc73c7..7707a7642 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -96,7 +96,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货申请
 defineOptions({ name: 'StockupMainRequest' })
 
@@ -407,19 +408,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await StockupMainRequestApi.exportStockupMainRequest(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 9a27a95b8..efafd2ed7 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -72,7 +72,8 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存余额
 defineOptions({ name: 'Balance' })
 
@@ -291,19 +292,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await BalanceApi.exportBalance(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/container/index.vue b/src/views/wms/inventoryManage/container/index.vue
index bd7f7de6d..6102a66ba 100644
--- a/src/views/wms/inventoryManage/container/index.vue
+++ b/src/views/wms/inventoryManage/container/index.vue
@@ -66,7 +66,8 @@ import { ContainerMain,ContainerMainRules,ContainerDetail,ContainerDetailRules }
 import * as ContainerMainApi from '@/api/wms/containerMain'
 import * as ContainerDetailApi from '@/api/wms/containerDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 供应商发票记录主
 defineOptions({ name: 'ContainerMain' })
 
@@ -140,18 +141,17 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await ContainerMainApi.exportContainerMain(tableObject.params)
     download.excel(data, '器具主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
index a05037933..004f6afb9 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
@@ -88,7 +88,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ContainerBindRecordMain' })
 
@@ -214,19 +215,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerBindRecordMainApi.exportContainerBindRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
index a7b736621..17161c99c 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
@@ -87,7 +87,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ContainerRepairRecordMain' })
 
@@ -213,19 +214,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerRepairRecordMainApi.exportContainerRepairRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
index cbdd0849f..e25e285eb 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
@@ -87,7 +87,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ContainerUnbindRecordMain' })
 
@@ -213,19 +214,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerUnbindRecordMainApi.exportContainerUnbindRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
index 136d05f97..020a5d083 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue
@@ -76,7 +76,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ContainerMain' })
 
 const message = useMessage() // 消息弹窗
@@ -265,19 +266,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerMainApi.exportContainerMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
index ba2ab218f..7c0826168 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
@@ -85,7 +85,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ContainerInitRecordMain' })
 
@@ -211,19 +212,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerInitRecordMainApi.exportContainerInitRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
index 3ee7909ab..a751cfc09 100644
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -69,7 +69,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Expectin' })
 
 const message = useMessage() // 消息弹窗
@@ -219,19 +220,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ExpectinApi.exportExpectin(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
index 6e4828a26..98a2b5a09 100644
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -70,7 +70,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Expectout' })
 
 const message = useMessage() // 消息弹窗
@@ -218,19 +219,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ExpectoutApi.exportExpectout(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue
index 911166dc2..f0ed80d0f 100644
--- a/src/views/wms/inventoryManage/locationcapacity/index.vue
+++ b/src/views/wms/inventoryManage/locationcapacity/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Locationcapacity' })
 
 const message = useMessage() // 消息弹窗
@@ -173,19 +174,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await LocationcapacityApi.exportLocationcapacity(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index aee66956f..d0bc30b50 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -71,6 +71,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain";
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 包装信息
 defineOptions({ name: 'package' })
 
@@ -193,7 +195,7 @@ const handleSelectionPoint = async ()=>{
     text: 'loading...',
     background: 'rgba(0, 0, 0, 0.7)'
   })
-  PackageApi.batchPrintingLable(rows).then(res => {
+  PackageApi.batchPrintingLables(rows).then(res => {
     console.log('批量打印res',res);
     getLoading?.close()
     if(res.zzLabel){
@@ -297,19 +299,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageApi.exportPackage(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
@@ -359,7 +360,7 @@ const formsSuccess = async (formType,data) => {
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
   console.log(row.packingNumber,445555555555555);
-  PackageApi.batchPrintingLable([row.number]).then(res => {
+  PackageApi.batchPrintingLables([row.number]).then(res => {
     console.log('批量打印res',res);
     if(res.zzLabel){
       //制造标签
diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index fd08ba8bd..2bcfbe349 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存事务
 defineOptions({ name: 'Transaction' })
 
@@ -174,19 +175,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransactionApi.exportTransaction(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue
index 9dfbee8a8..091fb784d 100644
--- a/src/views/wms/inventoryManage/transferlog/index.vue
+++ b/src/views/wms/inventoryManage/transferlog/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Transferlog' })
 
 const message = useMessage() // 消息弹窗
@@ -173,19 +174,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ExpectinApi.exportTransferlog(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index f40c2dcff..dee78a7a2 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -94,7 +94,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ContainerManageRequest' })
 
 const message = useMessage() // 消息弹窗
@@ -514,14 +515,13 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     const excelTitle = ref(route.meta.title)
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     if(routeName.value == 'ReturnContainerManageRequest'){
       const data = await ContainerMainRequestApi.exportReturnContainerMainRequest(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
@@ -537,7 +537,7 @@ const handleExport = async () => {
         }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
index 6d8a06bb9..c6c7e41c5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@@ -75,7 +75,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ContainerRecordMain' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -227,19 +228,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 3413bc5af..f13238f80 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -94,7 +94,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'InitialContainerManageRequest' })
 
 const message = useMessage() // 消息弹窗
@@ -469,19 +470,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerMainRequestApi.exportInitialContainerMainRequest(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 7fe70569d..3be8fb002 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -94,7 +94,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ScrapContainerManageRequest' })
 
 const message = useMessage() // 消息弹窗
@@ -494,19 +495,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerMainRequestApi.exportScrapContainerMainRequest(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
index 8c5fdde93..21de35179 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
@@ -73,7 +73,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存初始化记录主
 defineOptions({ name: 'InventoryinitRecordMain' })
 
@@ -157,19 +158,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InventoryinitRecordMainApi.exportInventoryinitRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 8dea8e088..2b762986c 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -92,7 +92,8 @@ import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain
 import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存初始化申请
 defineOptions({ name: 'InventoryinitRequestMain' })
 
@@ -398,19 +399,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 // }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
index c257c159b..95bc2f273 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
@@ -67,7 +67,8 @@ import * as PackagemergeMainApi from '@/api/wms/packagemergeMain'
 import * as PackagemergeDetailApi from '@/api/wms/packagemergeDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 合包记录
 defineOptions({ name: 'PackagemergeMain' })
 
@@ -133,19 +134,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackagemergeMainApi.exportPackagemergeMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
index dc0c3266b..bff991355 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
@@ -75,6 +75,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PackageoverJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -245,19 +247,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageoverJobMainApi.exportPackageoverJobMain(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index 26fa917f0..2d7de80bd 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -72,7 +72,8 @@ import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 翻包记录
 defineOptions({ name: 'PackageoverMain' })
 
@@ -179,19 +180,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index ef44e8787..9ca9c6a6a 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -86,7 +86,8 @@ import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain'
 import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PackageoverRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -360,19 +361,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageoverRequestMainApi.exportPackageoverRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
index c001b198e..c0a4dc124 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@@ -52,7 +52,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PackageoverRetrospect' })
 
 const message = useMessage() // 消息弹窗
@@ -147,19 +148,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackageoverRetrospectApi.exportPackageoverRetrospect(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
index 0bde40094..cb9b89898 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
@@ -67,7 +67,8 @@ import * as PackagesplitMainApi from '@/api/wms/packagesplitMain'
 import * as PackagesplitDetailApi from '@/api/wms/packagesplitDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 拆包记录
 defineOptions({ name: 'PackagesplitMain' })
 
@@ -133,19 +134,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PackagesplitMainApi.exportPackagesplitMainApi(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
index 7a36cd35c..86ab889fa 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
@@ -74,6 +74,8 @@ import * as ScrapJobDetailApi from '@/api/wms/scrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 报废出库任务主
 defineOptions({ name: 'ScrapJobMain' })
 
@@ -222,19 +224,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ScrapJobMainApi.exportScrapJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 5056fe6fa..b6f29dca9 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -86,6 +86,9 @@ export const ScrapJobMain = useCrudSchemas(
       table: {
         width: 150
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
       tableForm: {
         isInpuFocusShow: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成领用原因代码',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
index c964cf14d..ac521af8a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ScrapRecordDetailApi from '@/api/wms/scrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 报废出库记录主
 defineOptions({ name: 'ScrapRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ScrapRecordMainApi.exportScrapRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 231c63c9f..b5da4fca0 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -95,6 +95,9 @@ export const ScrapRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
       tableForm: {
         isInpuFocusShow: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成领用原因代码',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 2b82cc1b2..b09097359 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -119,7 +119,8 @@ import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 报废出库申请
 defineOptions({ name: 'ScrapRequestMain' })
 
@@ -595,19 +596,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ScrapRequestMainApi.exportScrapRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index f86c652aa..2aed0a8b8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -166,6 +166,9 @@ export const ScrapRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
       tableForm: {
         enterSearch: true,
         isInpuFocusShow: true, // 开启查询弹窗
@@ -842,9 +845,9 @@ export const ScrapRequestMainRules = reactive({
   costCenterType: [
     { required: true, message: '请输入成本中心类型', trigger: 'blur' }
   ],
-  reasonCodeRequisition: [
-    { required: true, message: '请输入领用原因代码', trigger: 'blur' }
-  ],
+  // reasonCodeRequisition: [
+  //   { required: true, message: '请输入领用原因代码', trigger: 'blur' }
+  // ],
 })
 
 /**
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
index a818b90dd..5f42c89bb 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptReco
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨入库记录主
 defineOptions({ name: 'UnplannedreceiptRecordMain' })
 
@@ -149,20 +151,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 2
     const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index e91ab26aa..751e2f82a 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -112,7 +112,8 @@ import * as ItembasicApi from "@/api/wms/itembasic";
 import { formatTime } from '@/utils/index'
 import { formatDate } from '@/utils/formatTime'
 import {handleSparepartReturnRequestMain} from "@/api/wms/unplannedreceiptRequestMain";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外入库申请
 defineOptions({ name: 'UnplannedreceiptRequestMain' })
 
@@ -498,20 +499,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 2
     const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index b066d50f2..401b48728 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -74,6 +74,8 @@ import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库任务主
 defineOptions({ name: 'UnplannedissueJobMainSpare' })
 
@@ -222,19 +224,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueJobMainApi.exportUnplannedissueJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index 87c2eb2d8..a1fb6bb8a 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库记录主
 defineOptions({ name: 'UnplannedissueRecordMainSpare' })
 
@@ -149,20 +151,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     tableObject.params.detailDataType = 2
     const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 3676c92d0..8e8b29650 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -92,7 +92,8 @@ import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMa
 import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库申请
 defineOptions({ name: 'UnplannedissueRequestMainSpare' })
 
@@ -394,20 +395,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 2
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
index 5c16481de..cb0876240 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -76,7 +76,8 @@ import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
 import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨出库任务主
 defineOptions({ name: 'TransferissueJobMain' })
 
@@ -262,19 +263,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferissueJobMainApi.exportTransferissueJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
index 986d92fc5..db4a3e3d7 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as TransferissueRecordDetailApi from '@/api/wms/transferissueRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨出库记录主
 defineOptions({ name: 'TransferissueRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferissueRecordMainApi.exportTransferissueRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index a409a3ff4..5e5e6debe 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -92,7 +92,8 @@ import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain
 import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨出库申请
 defineOptions({ name: 'TransferissueRequestMain' })
 
@@ -387,19 +388,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferissueRequestMainApi.exportTransferissueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
index 6e2efbd83..924ce6e1c 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
@@ -74,6 +74,8 @@ import * as TransferreceiptJobDetailApi from '@/api/wms/transferreceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨入库任务主
 defineOptions({ name: 'TransferreceiptJobMain' })
 
@@ -222,19 +224,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferreceiptJobMainApi.exportTransferreceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
index 33bb3a901..ee7aee182 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨入库记录主
 defineOptions({ name: 'TransferreceiptRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferreceiptRecordMainApi.exportTransferreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index ace5ed623..baffa33d7 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -90,7 +90,8 @@ import * as TransferreceiptRequestMainApi from '@/api/wms/transferreceiptRequest
 import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 // 调拨入库申请
 defineOptions({ name: 'TransferreceiptRequestMain' })
@@ -350,19 +351,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await TransferreceiptRequestMainApi.exportTransferreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
index 837dba3dc..86cbdaee2 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
@@ -74,6 +74,8 @@ import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库任务主
 defineOptions({ name: 'UnplannedissueJobMain' })
 
@@ -222,19 +224,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueJobMainApi.exportUnplannedissueJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
index 5576ccab7..342ad3be9 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库记录主
 defineOptions({ name: 'UnplannedissueRecordMain' })
 
@@ -149,20 +151,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 1
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 5f140eb93..f19d3f9b6 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -92,7 +92,8 @@ import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMa
 import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外出库申请
 defineOptions({ name: 'UnplannedissueRequestMain' })
 
@@ -431,20 +432,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 1
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index 77d639ded..3eeb8277c 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -74,6 +74,8 @@ import * as UnplannedreceiptJobDetailApi from '@/api/wms/unplannedreceiptJobDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外入库任务主
 defineOptions({ name: 'UnplannedreceiptJobMain' })
 
@@ -222,19 +224,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await UnplannedreceiptJobMainApi.exportUnplannedreceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
index 7972ac52c..f0e8b1661 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptReco
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 调拨入库记录主
 defineOptions({ name: 'UnplannedreceiptRecordMain' })
 
@@ -149,20 +151,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 1
     const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index b67ca0711..8df92cf66 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -125,6 +125,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    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: '成本中心代码',
@@ -383,7 +391,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'DatePicker',
       componentProps: {
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+        type: 'datetimerange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index a6e26c386..0cae01ffb 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -132,7 +132,8 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 计划外入库申请
 defineOptions({ name: 'UnplannedreceiptRequestMain' })
 
@@ -660,20 +661,19 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     tableObject.params.detailDataType = 1
     const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 0900ccb6a..722dce117 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -75,6 +75,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发料任务主
 defineOptions({ name: 'IssueJobMain' })
 
@@ -293,19 +295,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 4ca560e46..3d5102883 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -357,7 +357,7 @@ export const IssueJobMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: true
     },
     {
       label: '最后更新时间',
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 09be4ea36..31130ca53 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -69,6 +69,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发料记录主
 defineOptions({ name: 'IssueRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await IssueRecordMainApi.exportIssueRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 8b0a7ec37..2c8c6f650 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -104,7 +104,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 发料申请
 defineOptions({ name: 'IssueRequestMain' })
 
@@ -436,19 +437,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await IssueRequestMainApi.exportIssueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index 0b252d410..54e593df5 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -68,6 +68,8 @@ import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementReco
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 上线结算记录主
 defineOptions({ name: 'OnlinesettlementRecordMain' })
 
@@ -144,19 +146,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index fdb65cb33..1c93ba061 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -87,7 +87,8 @@ import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementReq
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 上线结算申请
 defineOptions({ name: 'OnlinesettlementRequestMain' })
 
@@ -260,19 +261,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/pick/pickJobMain/index.vue b/src/views/wms/issueManage/pick/pickJobMain/index.vue
index f15a0df81..fd8cf9dae 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickJobMain/index.vue
@@ -71,7 +71,8 @@ import { PickJobMain,PickJobMainRules,PickJobDetail,PickJobDetailRules } from '.
 import * as PickJobMainApi from '@/api/wms/pickJobMain'
 import * as PickJobDetailApi from '@/api/wms/pickJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货任务主
 defineOptions({ name: 'PickJobMain' })
 
@@ -207,18 +208,17 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PickJobMainApi.exportPickJobMain(tableObject.params)
     download.excel(data, '备货任务主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/index.vue b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
index 452cf87da..ec7419e5e 100644
--- a/src/views/wms/issueManage/pick/pickRecordMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
@@ -66,7 +66,8 @@ import { PickRecordMain,PickRecordMainRules,PickRecordDetail,PickRecordDetailRul
 import * as PickRecordMainApi from '@/api/wms/pickRecordMain'
 import * as PickRecordDetailApi from '@/api/wms/pickRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货记录主
 defineOptions({ name: 'PickRecordMain' })
 
@@ -140,18 +141,17 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PickRecordMainApi.exportPickRecordMain(tableObject.params)
     download.excel(data, '备货记录主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
index f33209171..2c5a0197e 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
@@ -85,7 +85,8 @@ import { PickRequestMain,PickRequestMainRules,PickRequestDetail,PickRequestDetai
 import * as PickRequestMainApi from '@/api/wms/pickRequestMain'
 import * as PickRequestDetailApi from '@/api/wms/pickRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备货申请
 defineOptions({ name: 'PickRequestMain' })
 
@@ -264,18 +265,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PickRequestMainApi.exportPickRequestMain(tableObject.params)
     download.excel(data, '备货申请主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index a45482301..f74e4883a 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -89,7 +89,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备料计划
 defineOptions({ name: 'PreparetoissueMain' })
 
@@ -451,19 +452,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PreparetoissueMainApi.exportPreparetoissueMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index 25664257a..d505694c4 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -74,6 +74,8 @@ import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产收料任务主
 defineOptions({ name: 'ProductionreceiptJobMain' })
 
@@ -293,19 +295,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index 7a755dd15..6abc52371 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产收料记录主
 defineOptions({ name: 'ProductionreceiptRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 829fa8cd5..20e67efd2 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -74,6 +74,8 @@ import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产退料任务主
 defineOptions({ name: 'ProductionreturnJobMain' })
 
@@ -265,19 +267,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index 1ac79535e..0cc61c972 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnReco
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产退料记录主 and 隔离退料记录
 defineOptions({ name: 'ProductionreturnRecordMain' })
 
@@ -150,19 +152,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index b4fff91b6..1b110156f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -111,7 +111,8 @@ import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产退料申请
 defineOptions({ name: 'ProductionreturnRequestMain' })
 
@@ -602,19 +603,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 817725eb9..f9abbabe4 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -113,7 +113,8 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 隔离退料申请
 defineOptions({ name: 'ProductionreturnRequestMainNo' })
 
@@ -556,19 +557,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
index 2ab729794..3acd9e58d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产退料记录主
 defineOptions({ name: 'ProductionscrapRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index d82c2e427..14824eb07 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -111,7 +111,8 @@ import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 线标原料报废申请
 defineOptions({ name: 'ProductionscrapRequestMain' })
 
@@ -600,19 +601,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index 0a6cdf28c..021c4b9f2 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -74,7 +74,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 补料任务主
 defineOptions({ name: 'RepleinshJobMain' })
 
@@ -321,19 +322,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RepleinshJobMainApi.exportRepleinshJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
index aaabc13e8..014fc6f0c 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@@ -68,7 +68,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 补料记录主
 defineOptions({ name: 'RepleinshRecordMain' })
 
@@ -146,19 +147,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 4e7d268d9..27e0800f1 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -88,7 +88,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 补料申请
 defineOptions({ name: 'RepleinshRequestMain' })
 
@@ -337,19 +338,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
index 97a9fc005..767925dd8 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as InventorychangeRecordDetailApi from '@/api/wms/inventorychangeRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存修改记录主
 defineOptions({ name: 'InventorychangeRecordMain' })
 
@@ -195,19 +197,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InventorychangeRecordMainApi.exportInventorychangeRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index d083700e1..a48bfd803 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -106,6 +106,8 @@ import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequest
 import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 
 const message = useMessage() // 消息弹窗
@@ -399,19 +401,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InventorychangeRequestMainApi.exportInventorychangeRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index cd055e2fa..6a7998ed7 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -74,6 +74,8 @@ import * as InventorymoveJobDetailApi from '@/api/wms/inventorymoveJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移任务主
 defineOptions({ name: 'InventorymoveJobMain' })
 
@@ -296,14 +298,13 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
 
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'OktoholdJobMain'){
       const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params)
@@ -329,7 +330,7 @@ const handleExport = async () => {
         }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 6f0905ed8..eef4d6bb0 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -494,7 +494,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -503,7 +503,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -520,7 +520,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: true,
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -806,34 +806,43 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     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: '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')]
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index b8f62ebf4..841240367 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -72,6 +72,8 @@ import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移记录主
 defineOptions({ name: 'InventorymoveRecordMain' })
 
@@ -232,14 +234,13 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
 
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'OktoholdRecordMain'){
       const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params)
@@ -265,7 +266,7 @@ const handleExport = async () => {
         }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 508315b44..d85f2fb2b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -98,6 +98,8 @@ import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移记录主
 defineOptions({ name: 'InventorymoveRecordMainNew' })
 
@@ -284,19 +286,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index e238a8a53..b82d9d005 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -89,7 +89,8 @@ import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain
 import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
 
@@ -653,13 +654,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'OktoholdRequestMain'){
       const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
@@ -684,7 +684,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index 8def5a68b..1203bba91 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -90,7 +90,8 @@ import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
 
@@ -669,13 +670,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'OktoholdRequestMain'){
       const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
@@ -700,7 +700,7 @@ const handleExport = async () => {
         }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index edda6cdf3..045d10869 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -92,7 +92,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import dayjs from 'dayjs'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 defineOptions({ name: 'InventorymoveRequestMain' })
 
@@ -687,13 +688,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value == 'OktoholdRequestMain'){
       const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
@@ -718,7 +718,7 @@ const handleExport = async () => {
         }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/moveManage/itemChange/index.vue b/src/views/wms/moveManage/itemChange/index.vue
index aeee4dfea..33be9148c 100644
--- a/src/views/wms/moveManage/itemChange/index.vue
+++ b/src/views/wms/moveManage/itemChange/index.vue
@@ -47,7 +47,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 物料调整
 defineOptions({ name: 'ItemChange' })
 
@@ -167,18 +168,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await BalanceApi.exportBalance(tableObject.params)
     download.excel(data, '库存余额.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
index ae74a1187..f3fe085ca 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as OfflinesettlementRecordDetailApi from '@/api/wms/offlinesettlementRe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 下线结算记录主
 defineOptions({ name: 'OfflinesettlementRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await OfflinesettlementRecordMainApi.exportOfflinesettlementRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
index 1321d24d0..03ac87af2 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
@@ -87,7 +87,8 @@ import { OfflinesettlementRequestMain,OfflinesettlementRequestMainRules,Offlines
 import * as OfflinesettlementRequestMainApi from '@/api/wms/offlinesettlementRequestMain'
 import * as OfflinesettlementRequestDetailApi from '@/api/wms/offlinesettlementRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 下线结算申请
 defineOptions({ name: 'OfflinesettlementRequestMain' })
 
@@ -272,18 +273,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await OfflinesettlementRequestMainApi.exportOfflinesettlementRequestMain(tableObject.params)
     download.excel(data, '下线结算申请主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
index b10e3b131..97e3e2fbd 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
@@ -83,7 +83,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ProcessproductionRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -230,19 +231,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProcessproductionRecordMainApi.exportProcessproductionRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index b4e3c69e1..6f769621e 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -99,7 +99,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 defineOptions({ name: 'ProcessproductionRequestMain' })
 
@@ -401,19 +402,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProcessproductionRequestMainApi.exportProcessproductionRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
index 8fe50a0c2..33ead0133 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@@ -74,6 +74,8 @@ import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品拆解任务主
 defineOptions({ name: 'ProductdismantleJobMain' })
 
@@ -216,19 +218,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductdismantleJobMainApi.exportProductdismantleJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index eeece57a8..c3c647c65 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -94,6 +94,8 @@ import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品拆解记录主
 defineOptions({ name: 'ProductdismantleRecordMain' })
 
@@ -219,19 +221,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductdismantleRecordMainApi.exportProductdismantleRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 09524c463..e79df3706 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -113,7 +113,8 @@ import * as BomDismantleApi from '@/api/wms/bomDismantle'
 import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
 import * as BomApi from "@/api/wms/bom";
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 // 制品拆解申请
 defineOptions({ name: 'ProductdismantleRequestMain' })
@@ -534,19 +535,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductdismantleRequestMainApi.exportProductdismantleRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 0714b74d0..7abcdd087 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -90,6 +90,8 @@ import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产计划主
 // 预生产计划
 defineOptions({ name: 'ProductionMain' })
@@ -132,6 +134,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow['id'] = item['id']
+          newRow['itemName'] = item['itemName']
           // 查看BOM版本
           console.log(22,item)
           const param1 =  {
@@ -542,19 +545,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionMainApi.exportProductionMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index f54be98de..5042e58f1 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -743,6 +743,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps:{
         disabled: true
       }
+    },
+    tableForm:{
+      disabled: true
     }
   },
   {
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 3c9e4ce62..a5335ec3c 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@@ -90,7 +90,8 @@ import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配计划
 defineOptions({ name: 'ProductionMainAssemble' })
 
@@ -131,6 +132,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           newRow['uom'] = item['uom']
+          newRow['itemName'] = item['itemName']
+
           // 查看BOM版本
           const param1 =  {
               productItemCode: item['itemCode'],
@@ -505,19 +508,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionMainApi.exportProductionMainAssemble(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
index a68c9f096..e4b002ef2 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@@ -743,6 +743,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: 'Bom版本',
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 635a26584..5f1d7a00b 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@@ -90,7 +90,8 @@ import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配备件计划
 defineOptions({ name: 'ProductionMainASparePart' })
 
@@ -124,6 +125,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           newRow['uom'] = item['uom']
+          newRow['itemName'] = item['itemName']
+
           // 查看BOM版本
           const param1 =  {
               productItemCode: item['itemCode'],
@@ -493,18 +496,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
index 01e34f445..81391162f 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@@ -742,6 +742,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: 'Bom版本',
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 3cb8bb4d0..a75670988 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@@ -90,7 +90,8 @@ import * as ItemBasicApi from '@/api/wms/itembasic'
 import * as BomApi from "@/api/wms/bom";
 import * as SwitchApi from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 预生产备件计划
 defineOptions({ name: 'ProductionMainPredictSparePart' })
 
@@ -124,6 +125,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
           newRow['uom'] = item['uom']
+          newRow['itemName'] = item['itemName']
+
           // 查看BOM版本
           const param1 =  {
               productItemCode: item['itemCode'],
@@ -495,19 +498,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductionMainApi.exportProductionMainPredictSparePart(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
index 82a6ceb40..47012f6f5 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@@ -730,6 +730,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: 'Bom版本',
diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
index 73055b195..6c75e604a 100644
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'QadProductionPlanMain' })
 
 const message = useMessage() // 消息弹窗
@@ -207,19 +208,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await QadProductionPlanMainApi.exportQadProductionPlanMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productionplan/workMain/index.vue b/src/views/wms/productionManage/productionplan/workMain/index.vue
index 1935f4027..bdab44141 100644
--- a/src/views/wms/productionManage/productionplan/workMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/workMain/index.vue
@@ -82,7 +82,8 @@ import { WorkMain,WorkMainRules,WorkDetail,WorkDetailRules } from './workMain.da
 import * as WorkMainApi from '@/api/wms/workMain'
 import * as WorkDetailApi from '@/api/wms/workDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 生产订单
 defineOptions({ name: 'WorkMain' })
 
@@ -232,18 +233,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await WorkMainApi.exportWorkMain(tableObject.params)
     download.excel(data, '生产订单主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 1dae7a485..0fc3c3863 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -77,7 +77,8 @@ import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as SwitchApi from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -239,19 +240,18 @@ const handleDocumentPrintAll = async () => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index 00476fc84..7065658c1 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index f8f85ce64..986342a1a 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -89,7 +89,8 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
 
@@ -335,19 +336,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayRequestMainApi.exportProductputawayRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index 48580ecad..41ebf2409 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -77,6 +77,8 @@ import * as SwitchApi from '@/api/wms/switch'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -242,19 +244,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index 537b8df2d..65067e86d 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 2d134ead9..60558202e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -89,7 +89,8 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品上架申请 装配上架申请 装配制品上架申请
 defineOptions({ name: 'ProductputawayRequestMain' })
 
@@ -337,19 +338,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductputawayRequestMainApi.exportProductputawayRequestMainAssemble(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 518556f93..9f076b485 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -105,6 +105,8 @@ import {
 } from "@/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data";
 
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货任务主
 // 预生产收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
@@ -343,19 +345,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index ca527db82..294fb6096 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -103,6 +103,8 @@ import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货记录主
 // 预生产收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
@@ -198,7 +200,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn(null), // 制品回收
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
 ]
 }
 
@@ -250,8 +252,17 @@ const labelRecovery = async (row) => {
   try {
     await message.confirm(t('ts.确认撤销报工吗？'))
     tableObject.loading = true
-    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
-    message.success(t('ts.确认撤销报工成功'))
+    const params = ref({
+      number: '',
+      inventoryStatus: '',
+    })
+    params.number= row.number;
+    params.inventoryStatus= row.inventoryStatus;
+
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params);
+    message.success(t('ts.撤销报工成功'))
+    buttonBaseClick('refresh',null)
+
   } catch {
   } finally {
     tableObject.loading = false
@@ -303,19 +314,18 @@ const handleCreateInspectRequest = async (number:string) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index a5be22d72..656b5cfff 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -186,7 +186,8 @@ import * as BomApi from '@/api/wms/bom'
 import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货申请
 // 预生产收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
@@ -280,6 +281,7 @@ const setTableFormsValues = async (val, index1) => {
     newRow['itemCode'] = val[index1]['itemCode']
     newRow['uom'] = val[0]['uom']
     newRow['produceDate'] = dayjs().valueOf()
+    newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
 
     const param1 = {
       productItemCode: val[0]['itemCode'],
@@ -659,13 +661,12 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(
       tableObject.params
@@ -673,7 +674,7 @@ const handleExport = async () => {
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
index d3116835b..a41ef3d2e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
@@ -44,7 +44,8 @@ import {
   MesRawMaterialConsumptionInfo
 } from './mesRawMaterialConsumptionInfo.data'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配收货记录主
 defineOptions({ name: 'RawMaterialConsumptionInfo' })
 
@@ -102,12 +103,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await MesRawMaterialConsumptionInfoApi.exportAssemblyMaterialUsageMes(tableObject.params)
     download.excel(data, '装配完工原料信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index 02a099ecf..e6bd21d79 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -74,7 +74,8 @@ import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配收货任务主
 defineOptions({ name: 'ProductreceiptJobMainA' })
 
@@ -283,19 +284,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainAssemble(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 3fa05b7aa..195e1dab4 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -123,7 +123,8 @@ import {
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配收货记录主
 defineOptions({ name: 'ProductreceiptRecordMainA' })
 
@@ -236,7 +237,7 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn(null), // 制品回收
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]
 }
 
@@ -280,8 +281,16 @@ const handleCreatePutawayRequest = async (number:string) => {
 const labelRecovery = async (row) => {
   try {
     await message.confirm(t('ts.确认撤销报工吗？'))
-    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
-    message.success(t('ts.确认撤销报工成功'))
+    tableObject.loading = true
+    const params = ref({
+      number: '',
+      inventoryStatus: '',
+    })
+    params.number= row.number;
+    params.inventoryStatus= row.inventoryStatus;
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params)
+    message.success(t('ts.撤销报工成功'))
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -364,19 +373,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordAssembleMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index dd7b5f91a..159dfdfaa 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -153,7 +153,8 @@ import * as BomApi from "@/api/wms/bom";
 import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配收货申请
 defineOptions({ name: 'ProductreceiptRequestMainA' })
 
@@ -244,6 +245,7 @@ const setTableFormsValues = async (val, index1) => {
     newRow['itemCode'] = val[index1]['itemCode']
     newRow['uom'] = val[0]['uom']
     newRow['produceDate'] = dayjs().valueOf()
+    newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
 
     const param1 = {
       productItemCode: val[0]['itemCode'],
@@ -573,19 +575,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainAssemble(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
index c938e8da9..7839573f2 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
@@ -44,7 +44,8 @@ import {
   RawMaterialConsumptionInfo
 } from './rawMaterialConsumptionInfo.data'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 装配收货记录主
 defineOptions({ name: 'RawMaterialConsumptionInfo' })
 
@@ -111,12 +112,12 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await RawMaterialConsumptionInfoApi.exportAssemblyMaterialUsage(tableObject.params)
     download.excel(data, '装配完工原料信息.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index a46e9350c..a738a7da0 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -75,6 +75,8 @@ import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
 
@@ -280,19 +282,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
index d7d4a729d..be0ca8bfa 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@@ -93,6 +93,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
 
@@ -192,19 +194,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 45fd2b9d4..e57b2268b 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -158,7 +158,8 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import dayjs from 'dayjs'
 import { addDay } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品收货申请
 // 隔离报工申请
 // 隔离收货申请
@@ -570,19 +571,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index b11c354cf..e44e29c50 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -61,7 +61,8 @@ import * as ProductredressJobMainApi from '@/api/wms/productredressJobMain'
 import * as ProductredressJobDetailApi from '@/api/wms/productredressJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ProductredressJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -188,19 +189,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductredressJobMainApi.exportProductredressJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index feb84a75c..2527ffb16 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -51,8 +51,18 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     isTable:true,
   },
+  {
+    label: '车间代码',
+    field: 'workShopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
   {
     label: '申请时间',
     field: 'requestTime',
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
index da2fc8db2..1964bdc01 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
@@ -59,7 +59,8 @@ import * as ProductredressRecordMainApi from '@/api/wms/productredressRecordMain
 import * as ProductredressRecordDetailApi from '@/api/wms/productredressRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ProductredressRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -132,19 +133,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductredressRecordMainApi.exportProductredressRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 4185efe9f..8afc4124d 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -43,26 +43,36 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
   },
+  // {
+  //   label: '状态',
+  //   field: 'status',
+  //   dictType: DICT_TYPE.REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isForm:false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isForm:false,
-    isTable: true,
+    label: '生产线代码',
+    field: 'productionlineCode',
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    isSearch:true,
+    isTable:true,
   },
   {
-    label: '生产线代码',
-    field: 'productionlineCode',
+    label: '车间代码',
+    field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable:true,
+    isSearch: true,
   },
   // {
   //   label: '生产计划单号',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index c73a1a9a4..eeb5c77e8 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -114,7 +114,8 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'ProductredressRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -375,19 +376,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductredressRequestMainApi.exportProductredressRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 02030f9a1..ad94646d0 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -106,6 +106,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable:true,
+    isSearch:true,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 6ba640900..24d2d73ff 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
@@ -97,6 +97,8 @@ import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
 
@@ -258,19 +260,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductrepairRecordMainApi.exportProductrepairRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 14037bb28..dd3aa3841 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -118,7 +118,8 @@ import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
 import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
 import * as BomApi from "@/api/wms/bom";
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 // 制品返修申请
 defineOptions({ name: 'ProductrepairRequestMain' })
@@ -568,19 +569,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductrepairRequestMainApi.exportProductrepairRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
index f6be26c1b..f62224f93 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
@@ -74,6 +74,8 @@ import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品报废任务主
 defineOptions({ name: 'ProductscrapJobMain' })
 
@@ -216,19 +218,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductscrapJobMainApi.exportProductscrapJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index 4babb15c9..f880d248e 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@@ -96,6 +96,8 @@ import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品报废记录主
 defineOptions({ name: 'ProductscrapRecordMain' })
 
@@ -259,19 +261,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductscrapRecordMainApi.exportProductscrapRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 16a0a352d..551eca89d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -116,6 +116,18 @@ export const ProductscrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '报废原因',
+      field: 'scrappingReason',
+      dictType: DICT_TYPE.SCRAPPING_REASON,
+      dictClass: 'string',
+      isForm: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '任务单号',
       field: 'jobNumber',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 3772e2435..9e93edc0e 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -125,7 +125,8 @@ import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
 import * as BalanceApi from "@/api/wms/balance";
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
 
@@ -721,19 +722,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ProductscrapRequestMainApi.exportProductscrapRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 881153b74..d88934572 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -310,6 +310,18 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '报废原因',
+      field: 'scrappingReason',
+      dictType: DICT_TYPE.SCRAPPING_REASON,
+      dictClass: 'string',
+      isForm: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '从仓库代码',
       field: 'fromWarehouseCode',
@@ -644,6 +656,9 @@ export const ProductscrapRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  scrappingReason: [
+    { required: true, message: '请输入报废原因', trigger: 'blur' }
+  ],
 })
 
 /**
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index 651ccf6bc..ee421794c 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -74,6 +74,8 @@ 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'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 检验任务主
 defineOptions({ name: 'InspectJobMain' })
 
@@ -226,19 +228,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index 30d9c98c6..a353967d2 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -73,6 +73,8 @@ 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'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 检验记录主
 defineOptions({ name: 'InspectRecordMain' })
 
@@ -172,19 +174,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index d634e8b7e..0403f1f3e 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -54,7 +54,8 @@
   import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import { formatDate } from '@/utils/formatTime'
-
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
   // 到货检验申请
   defineOptions({ name: 'InspectRequestMain' })
 
@@ -315,19 +316,18 @@
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 74a76de16..82a8384bd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -105,6 +105,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -356,19 +358,18 @@ const tableFormButton = async (val , row) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index d2431c211..a7e9b2013 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -114,9 +114,13 @@ import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecord
 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 {getJmreportBaseUrl, getReportUrl} from '@/utils/systemParam'
 
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {mainListPointBtn, mainListPrintInspectionBtn} from "@/utils/disposition/defaultButtons";
+import {getAccessToken} from "@/utils/auth";
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 const message = useMessage() // 消息弹窗
@@ -179,13 +183,14 @@ const isShowSourceTypeButton = (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.mainListPrintInspectionBtn(null)]
   }
   return [
    defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
    defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
    //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
     defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
+    defaultButtons.mainListPrintInspectionBtn(null),
   ]
 }
 
@@ -198,6 +203,8 @@ const buttonTableClick = async (val, row) => {
   }else if(val == 'mainPlanCheckQualityReport'){
     // 查看质检报告
     checkQualityReport(row)
+  }else if (val == 'printInspection'){
+    handlePrint(row)
   }
 }
 // 查看质检报告
@@ -210,6 +217,12 @@ const checkQualityReport = async (row)=>{
   qualityReport.value = `${getReportUrl()}/purchasereceiptReport?asnNumber=${row.asnNumber}`
 }
 
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/986481894320525312?token=' + getAccessToken())
+const handlePrint = async (row) => {
+  window.open(src.value+'&jobNumber='+row.jobNumber)
+}
+
 /** 生成采购上架申请按钮操作 */
 const handleCreatePutawayRequest = async (number:string) => {
   try{
@@ -296,13 +309,12 @@ const tableFormButton = async (val , row) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
@@ -313,7 +325,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
index f4d5f3823..9e8c619ed 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -116,6 +116,8 @@ import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsLi
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getReportUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordRefuseMain' })
 const message = useMessage() // 消息弹窗
@@ -284,14 +286,13 @@ const tableFormButton = async (val , row) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
-      const excelTitle = ref(route.meta.title)
+    loadStart()
+    const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
@@ -301,7 +302,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index dc4670e67..abc99b0a1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -186,7 +186,8 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { getReportUrl } from '@/utils/systemParam'
 import { dateFormatter2 } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
 
@@ -755,19 +756,18 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index b59b95f10..ba42051be 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -168,7 +168,8 @@ import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { getReportUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货申请-M类型收货
 defineOptions({ name: 'PurchasereceiptRequestOrderMTypeMain' })
 
@@ -693,19 +694,18 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 740fa9daa..8facc3d1b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -74,7 +74,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货任务主
 defineOptions({ name: 'PurchasereturnJobMain' })
 
@@ -231,19 +232,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index c43899e89..e6c4d78ae 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -71,6 +71,8 @@ import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
 
@@ -162,13 +164,12 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
@@ -179,7 +180,7 @@ const handleExport = async () => {
     }
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 8512c8b4c..4441297a9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -140,6 +140,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMain' })
 
@@ -749,13 +751,12 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       tableObject.params
@@ -763,7 +764,7 @@ const handleExport = async () => {
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 4e6d0f9e3..0a32f2981 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -169,6 +169,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMainNew' })
 
@@ -665,13 +667,12 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       tableObject.params
@@ -679,7 +680,7 @@ const handleExport = async () => {
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
index f3f07b615..1e60303e7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
@@ -71,6 +71,8 @@ import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
   import { formatDate } from '@/utils/formatTime'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordSpareMain' })
 
@@ -162,13 +164,12 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
@@ -180,7 +181,7 @@ const handleExport = async () => {
     
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index 8469b9ea0..da30f3178 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -142,6 +142,8 @@ 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'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestSpareMain' })
 
@@ -699,13 +701,12 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
@@ -713,7 +714,7 @@ const handleExport = async () => {
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 9990aa9ee..bfaaf2038 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -102,6 +102,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {getAccessToken} from "@/utils/auth";
 import { getJmreportBaseUrl } from '@/utils/systemParam'
   import { formatDate } from '@/utils/formatTime'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -341,19 +343,18 @@ const handleClose = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index c8257f4de..333dc6252 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -92,6 +92,8 @@ 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'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
 // 上架记录主
 defineOptions({ name: 'PutawayRecordMain' })
 
@@ -204,19 +206,18 @@ const tableFormButton = async (val , row) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 504cdafcf..761f37e8f 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -111,7 +111,8 @@ 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'
-
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
 // 上架申请
 defineOptions({ name: 'PutawayRequestMain' })
 
@@ -399,19 +400,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index 86414352e..ae96d00d7 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -75,6 +75,8 @@ 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'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备件收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
@@ -252,19 +254,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
index 072018567..45110c5d3 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -72,6 +72,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {exportSparereceiptRecordMain} from "@/api/wms/purchasereceiptRecordMain";
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })
 
@@ -153,19 +155,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index d738b2fc8..62eba8b5a 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -134,7 +134,8 @@ import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 备件收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
 
@@ -238,6 +239,7 @@ const updateTableData = (tableList)=>{
     newRow['uom'] = row['uom']
     newRow['poNumber'] =row['number']
     newRow['supplierCode'] =row['supplierCode']
+    newRow['qty'] =row['orderQty']
     //生产日期 到货日期 默认当天
     newRow['produceDate'] = dayjs().valueOf()
     newRow['arriveDate'] = dayjs().valueOf()
@@ -553,20 +555,18 @@ const handleSubmit = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
-  }
+    loadDone()  }
 }
 
 /**
@@ -600,6 +600,13 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let isThen = tableData.value.some(item => {
+    return parseFloat(item.qty) > parseFloat(item.orderQty)
+  })
+  if(isThen){
+      message.error(t('ts.收货数量不可以大于订单数量!'))
+    return;
+  }
   data.subList = tableData.value // 拼接子表数据参数
   formRef.value.formLoading = true
   try {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index fd3e60289..7356875d3 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -18,7 +18,7 @@ const { t } = useI18n() // 国际化
 const queryParams = {
   pageSize:10,
   pageNo:1,
-  code:'PurchaseReceiptRequest'
+  code:'PurchaseReceiptSpareRequest'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
@@ -465,7 +465,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
+    isForm: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -477,7 +477,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled: true,
       }
     }
   },
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 92ef839d7..094a5d307 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -43,7 +43,8 @@ import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
 import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 要货预测
 defineOptions({ name: 'DemandforecastingMain' })
 
@@ -176,19 +177,18 @@ const searchClick = async (data)=>{
   setSearchParams(data)
 }
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index b324e3ed3..e2a1bf390 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -50,7 +50,8 @@ import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
 import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 要货预测
 defineOptions({ name: 'DemandforecastingMain' })
 
@@ -182,19 +183,18 @@ const searchClick = async (data)=>{
   setSearchParams(data)
 }
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 77e6c244a..a6b0182b8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -101,10 +101,11 @@
   import * as ItembasicApi from '@/api/wms/itembasic'
   import TableDetail from '@/components/TableDetail/src/TableDetail.vue'
   import { formatDate } from '@/utils/formatTime'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
 
   // 采购订单
   defineOptions({ name: 'PurchaseMain' })
-
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
   const route = useRoute() // 路由信息
@@ -483,19 +484,18 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await PurchaseMainApi.exportPurchaseMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
new file mode 100644
index 000000000..8affbe3d8
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue
@@ -0,0 +1,615 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...PurchaseMain.allSchemas.searchSchema,...PurchaseDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" :detailAllSchemas="PurchaseDetail.allSchemas" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable ref="elTableRef"
+    :selection="false"
+    :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" @getSelectionRows="getSelectionRows">
+    <!-- <Table ref="elTableRef"  :expand="true" :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+        total: tableObject.total
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort" >
+      <template #expand="{ row }">
+        <TableDetail 
+          :openDetailParams="{
+            row: row, 
+          }"
+          :width="expandDetailWidth"
+          :allSchemas="PurchaseMain.allSchemas"
+          :detailAllSchemas="PurchaseDetail.allSchemas" 
+          :apiPage="PurchaseDetailApi.getPurchaseDetailPage" 
+          @searchTableSuccessDetail="searchTableSuccessDetail"
+        />
+      </template> -->
+      <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" 
+    @success="getList" 
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    :rules="PurchaseMainRules" 
+    :formAllSchemas="PurchaseMain.allSchemas"
+    :tableAllSchemas="PurchaseDetail.allSchemas" 
+    :tableFormRules="PurchaseDetailRules" 
+    :tableData="tableData"
+    :apiUpdate="PurchaseMainApi.updatePurchaseMain" 
+    :apiCreate="PurchaseMainApi.createPurchaseMain" 
+    :isBusiness="true"
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @clearSearchInput="clearSearchInput"
+    @submitForm="submitForm"
+    @onChange="onChangeQty"
+    @onEnter="onEnter"
+    
+    />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="PurchaseMain.allSchemas"
+    :detailAllSchemas="PurchaseDetail.allSchemas" 
+    :detailAllSchemasRules="PurchaseDetailRules"
+    :apiCreate="PurchaseDetailApi.createPurchaseDetail" 
+    :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
+    :apiPage="PurchaseDetailApi.getPurchaseDetailPageWMS" 
+    :apiDelete="PurchaseDetailApi.deletePurchaseDetail" 
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
+
+  <!-- 导入 -->
+  <ImportForm 
+  ref="importFormRef" 
+  url="/wms/purchase-main/import" 
+  :importTemplateData="importTemplateData"
+    @success="importSuccess" 
+    :isShowOut="true" 
+    :updateIsDisable="true" 
+    :coverIsDisable="true" 
+    :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { PurchaseMain, PurchaseMainRules, PurchaseDetail, PurchaseDetailRules } from './purchaseMain.data'
+  import * as PurchaseMainApi from '@/api/wms/purchaseMainWms'
+  import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as ItembasicApi from '@/api/wms/itembasic'
+  import TableDetail from '@/components/TableDetail/src/TableDetail.vue'
+  import { formatDate } from '@/utils/formatTime'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
+  // 采购订单
+  defineOptions({ name: 'PurchaseMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref([...PurchaseMain.allSchemas.tableColumns,...PurchaseDetail.allSchemas.tableMainColumns])
+console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searchSchema)
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+
+  const elTableRef  = ref()
+  // 计算扩展明细宽度
+  const expandDetailWidth  = ref('')
+  onMounted(() => {
+    const width = unref(elTableRef)?.$el.getBoundingClientRect().width
+    expandDetailWidth.value = width+'px'
+  })
+
+
+  const clearSearchInput  = (formField)=>{
+    tableData.value = []
+  }
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async() => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        if(formField == 'itemCode'){
+          const repeatCode = [] //重复数据
+          if(tableData.value.length > 0){
+            tableData.value.forEach((item) => {
+              const findIndex = val.findIndex(valItem=>valItem['itemCode']==item.itemCode) 
+              if(findIndex > -1){
+                val.splice(findIndex,1)
+                repeatCode.push(item.itemCode)
+              }
+            })
+          }
+          if(repeatCode.length>0){
+            message.warning(`${t('ts.物料代码')}${repeatCode.join(',')}${t('ts.已经存在')}`);
+          }
+          if(val.length>0){
+            //frm表单回显
+            const setV = {}
+            if(val[0]['supplierCode']!=formRef.formModel.supplierCode){
+              tableData.value = [] // 清空子表数据
+            }
+            setV['contactName']=val[0]['contacts']
+            setV['contactPhone']=val[0]['phone']
+            setV['contactEmail']=val[0]['email']
+            if(formRef.formModel.taxRate==0){
+              setV['taxRate']=val[0]['taxRate']
+            }
+            formRef.setValues(setV)
+            //明细
+            val.forEach(item=>{
+              const newRow = {...row}
+              newRow[formField] = item[searchField]
+              let lineNumber = 1
+              if(tableData.value.length>0){
+                lineNumber = 1+(tableData.value[tableData.value.length-1]['lineNumber'])
+              }
+              newRow['lineNumber'] = lineNumber
+              newRow['uom'] = item['supplierUom']
+              newRow['id'] = item['id']
+              tableData.value.push(newRow)
+            })
+            // const itemCodes = val.map(valItem=>valItem['itemCode'])
+            // await ItembasicApi.getItembasicPage({
+            //   code: itemCodes.join(',')
+            // }).then(res => {
+            //   row['uom'] = res.list[0].uom
+            // })
+          }
+          
+        }
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        if(formField == 'supplierCode'){
+          tableData.value = [] // 清空子表数据
+          setV['contactName']=val[0]['contacts']
+          setV['contactPhone']=val[0]['phone']
+          setV['contactEmail']=val[0]['email']
+          setV['taxRate']=val[0]['taxRate']
+          formRef.setValues(setV)
+          onEnter('supplierCode')
+        }
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async() => {
+      const setV = {}
+      if(formField == 'itemCode'){
+          await ItembasicApi.getItembasicPage({
+            code: setV['itemCode']
+          }).then(res => {
+            setV['uom'] = res.list[0].uom
+            setV[formField] = val[0][searchField]
+          })
+        }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
+    // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main-wms:export' }), // 导出
+    // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
+    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=='mainOrderSelectionPub'){// 批量发布
+      handleSelectionPublish()
+    } 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.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:purchase-main-wms:close' }), // 关闭
+      defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']),hasPermi: 'wms:purchase-main-wms:open' }), // 打开
+      defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:purchase-main-wms:publish' }), // 发布
+      defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']),hasPermi: 'wms:purchase-main-wms:wit' }), // 下架
+      // defaultButtons.mainListEditBtn({ hasPermi: 'wms:purchase-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
+      // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:purchase-main:delete', hide: isShowMainButton(row, ['1']) }), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleDelete(row.masterId)
+    } else if (val == 'mainOrderClo') { // 关闭
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleClose(row.masterId)
+    } else if (val == 'mainOrderOpe') { // 打开
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleOpen(row.masterId)
+    } else if (val == 'mainOrderPub') { // 发布
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handlePublish(row.masterId)
+    } else if (val == 'mainOrderWit') { // 下架
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      handleWit(row.masterId)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    console.log("【purchaseMain】type类型:",type);
+    tableData.value = [] // 重置明细数据
+    if(type == 'create'){
+      PurchaseMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'supplierCode') {
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    if(type == 'update'){
+      PurchaseMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'supplierCode') {
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    if(row.type == 'DISCRETE'){
+      PurchaseDetail.allSchemas.formSchema.map((item) => {
+        if (item.field == 'orderQty') {
+          item.componentProps.disabled = false
+        }
+      })
+    }else{
+      PurchaseDetail.allSchemas.formSchema.map((item) => {
+        if (item.field == 'orderQty') {
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    detailRef.value.openDetail(row, titleName, titleValue,'order_purchase_main')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      tableObject.loading = true
+      // 发起删除
+      await PurchaseMainApi.deletePurchaseMain(id)
+      message.success(t('common.delSuccess'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch {}finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm(t('ts.是否关闭所选中数据？'))
+      tableObject.loading = true
+      // 发起关闭
+      await PurchaseMainApi.closePurchaseMain(id)
+      message.success(t('ts.关闭成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm(t('ts.是否打开所选中数据？'))
+      tableObject.loading = true
+      // 发起打开
+      await PurchaseMainApi.openPurchaseMain(id)
+      message.success(t('ts.打开成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+  const searchList = (model)=>{
+    selectionRows.value = []
+    const model1 = {
+      ...model
+    }
+    model1.itemTypeList =model.itemTypeList.filter(item=>item)
+    setSearchParams(model1)
+  }
+  const selectionRows = ref<any>([])
+  const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+    console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+    const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+    if(currentRows){
+      currentRows.selectionRows = currentPageSelectionRows
+    }else{
+      selectionRows.value.push({
+        currentPage,
+        selectionRows:currentPageSelectionRows
+      })
+    }
+  }
+  // 批量发布
+  const handleSelectionPublish = async ()=>{
+  // 发布的二次确认
+  await message.confirm(t('ts.是否发布所选中数据？'))
+  tableObject.loading = true
+  let rows:any = []
+  selectionRows.value.map(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
+  })
+  tableObject.loading = true
+  Promise.all( rows.map(item=>PurchaseMainApi.publishPurchaseMain(item))).then((res) => {
+    console.log('发布',res)
+    if(res.every(item=>item==true)){
+      message.success(t('ts.发布成功!'))
+    }
+  }).finally(()=>{
+    tableObject.loading = false
+    // 刷新列表
+    getList()
+  })
+}
+  /** 发布按钮操作 */
+  const handlePublish = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm(t('ts.是否发布所选中数据？'))
+      tableObject.loading = true
+      // 发起发布
+      await PurchaseMainApi.publishPurchaseMain(id)
+      message.success(t('ts.发布成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 下架按钮操作 */
+  const handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm(t('ts.是否下架所选中数据？'))
+      tableObject.loading = true
+      // 发起下架
+      await PurchaseMainApi.witPurchaseMain(id)
+      message.success(t('ts.下架成功!'))
+      tableObject.loading = false
+      // 刷新列表
+      await getList()
+    } catch { }finally{
+      tableObject.loading = false
+    }
+  }
+
+  /** 导出按钮操作 */
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      loadStart()
+      const excelTitle = ref(route.meta.title)
+      const data = await PurchaseMainApi.exportPurchaseMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    } catch {
+    } finally {
+      loadDone()
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  PurchaseDetail.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))
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, submitData) => {
+    let data = {...submitData}
+    if(data.masterId){
+      data.id = data.masterId
+    }
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await PurchaseMainApi.createPurchaseMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PurchaseMainApi.updatePurchaseMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+  const onChangeQty = (field, cur) => {
+    if(field == 'type' && cur == 'DISCRETE'){
+      PurchaseDetail.allSchemas.tableFormColumns.map((item) => {
+        if (item.field == 'orderQty') {
+          console.log("AAAAAA",item)
+          item.tableForm.disabled = false
+          item.hidden = false
+        }
+      })
+    }
+    if(field == 'type' && cur == 'SCHEDULE'){
+      PurchaseDetail.allSchemas.tableFormColumns.map((item) => {
+        if (item.field == 'orderQty') {
+          console.log("BBBBB",item)
+          item.tableForm.disabled = true
+          item.hidden = true
+        }
+      })
+    }
+
+  }
+
+  const onEnter = (field)=>{
+    tableData.value = []
+    const timer = setTimeout(()=>{
+      formRef.value.handleAddTable()
+      if(timer){
+        clearTimeout(timer)
+      }
+    },500)
+  }
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await PurchaseMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
new file mode 100644
index 000000000..25ce89d60
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
@@ -0,0 +1,974 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import { validateHanset, validateEmail } from '@/utils/validator'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 采购订单主表
+ */
+export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      labelMessage: '影响明细中物料代码，需在供应商物料中维护',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+   {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料类型',
+    field: 'itemTypeList',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    isSearch: true,
+    sort: 'custom',
+    search: {
+      componentProps: {
+        multiple: true,//多选
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    isSearch: true,
+    sortSearchDefault:1000,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '订单日期',
+    field: 'orderDate',
+    isTable: true,
+    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',
+      },
+      value: new Date().getTime()
+    },
+  },
+  {
+    label: '截止日期',
+    field: 'dueDate',
+    isTable: false,
+    isForm: false,
+    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: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0,
+        max: 1,
+        precision: 6,
+      }
+    }
+  },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '当前阶段',
+    field: 'currentStage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '是否寄存订单',
+    field: 'isConsignment',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable:true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        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: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PurchaseMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  type:  [
+    { required: true, message: '请选择订单类型', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  orderDate: [
+    { required: true, message: '请输入订单日期', trigger: 'change' }
+  ],
+  taxRate:  [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  version:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactName:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+  ],
+  contactEmail:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购订单子表
+ */
+export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    isTableForm: false,
+    hiddenInMain:true,
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '行号',
+    field: 'lineNumber',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      isSearchList: true, // 开启查询弹窗
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      multiple:true,//多选
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商物料',
+      searchField: 'itemCode',
+      searchTitle: '供应商物料信息',
+      searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
+      searchCondition: [{
+        key:'supplierCode',
+        value:'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }],
+      verificationPage:  SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      isShowTableFormSearch: true, //tableForm下方是否出现输入框
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
+      // 失去焦点校验参数
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true,
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择供应商物料',
+        searchField: 'itemCode',
+        searchTitle: '供应商物料信息',
+        searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
+      searchCondition: [{
+        key:'supplierCode',
+        value:'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+        }],
+        // 失去焦点校验参数
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true,
+        }]
+      }
+    }
+  },
+ {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm:true,
+    form:{
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'Select',
+    },
+    table: {
+      width: 150
+    },
+ },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:false,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:false,
+      hidden:false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
+  },
+  // {
+  //   label: 'ERP库位',
+  //   field: 'erpLocationCode',
+  //   dictType : DICT_TYPE.ERP_LOCATION,
+  //   dictClass: 'string',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    hiddenInMain:true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    hiddenInMain:true,
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    hiddenInMain:true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    hiddenInMain:true,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    hiddenInMain:true,
+     table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  // {
+  //   label: t('ts.已计划数量'),
+  //   field: 'plannedQty',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:true,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     },
+  //     value: 1
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  {
+    label: t('ts.已发货数量'),
+    field: 'shippedQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: t('ts.已收货数量'),
+    field: 'receivedQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: t('ts.已退货数量'),
+    field: 'returnedQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: t('ts.已上架数量'),
+    field: 'putawayQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      value: 1,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: t('ts.单价'),
+    field: 'singlePrice',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm:{
+      type:'Select',
+      default: 'TRUE',
+      inactiveValue: 'FALSE',
+      activeValue: 'TRUE'
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '超收百分比',
+    field: 'overReceivingPercent',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    isTable:false,
+    isTableForm:false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isForm: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    isTableForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isTableForm: false,
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isForm: false,
+    // form: {
+    //   component: 'DatePicker',
+    //   componentProps: {
+    //     style: {width:'100%'},
+    //     type: 'datetime',
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //     valueFormat: 'x',
+    //   }
+    // }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    isTableForm: false,
+    isTable: true,
+    hiddenInMain:true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '备注',
+    hiddenInMain:true,
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    hiddenInMain:true,
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PurchaseDetailRules = reactive({
+  lineNumber: [
+    { required: true, message: '请输入行号', trigger: 'blur' }, 
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  packQty:  [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  taxRate:  [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  shippedQty:  [
+    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+  ],
+  receivedQty:  [
+    { required: true, message: '请输入已收货数量', trigger: 'blur' }
+  ],
+  returnedQty:  [
+    { required: true, message: '请输入已退货数量', trigger: 'blur' }
+  ],
+  putawayQty:  [
+    { required: true, message: '请输入已上架数量', trigger: 'blur' }
+  ],
+  overReceivingPercent:  [
+    { required: true, message: '请输入超收百分比', trigger: 'blur' }
+  ],
+  orderQty:  [
+    { required: true, message: '请输入订单数量', trigger: 'blur' }
+  ],
+  // uom:  [
+  //   { required: true, message: '请选择计量单位', trigger: 'change' }
+  // ],
+  available:  [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  nuumber:  [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode:  [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index d70b0a6ff..b36c4f3c3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -122,6 +122,8 @@
   import { PurchaseMain } from '../purchaseMain/purchaseMain.data'
   import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
   const { wsCache } = useCache()
   const language = wsCache.get('lang')
   const announcements  = ref<any>([])
@@ -710,19 +712,18 @@ const handleSelectionPublish = async ()=>{
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await PurchasePlanMainApi.exportPurchasePlanMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
@@ -732,13 +733,13 @@ const handleSelectionPublish = async ()=>{
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await PurchasePlanMainApi.exportDetailsPurchasePlanMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
   
@@ -747,13 +748,13 @@ const handleSelectionPublish = async ()=>{
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await PurchasePlanMainApi.exportTablePurchasePlanMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}二维表】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
   /**
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
index fee722120..0c5fc47fc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@@ -65,7 +65,8 @@ import { Package,PackageRules } from './supplierPackage.data'
 import * as PackageApi from '@/api/wms/package'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'PurchasePackage' })
 
 const message = useMessage() // 消息弹窗
@@ -223,18 +224,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await PackageApi.exportPackage(tableObject.params)
     download.excel(data, '包装.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue
index 3e932f05f..20848b906 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierdeliverInspectionDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SupplierdeliverInspectionDetailApi.exportSupplierdeliverInspectionDetail(tableObject.params)
     download.excel(data, '供应商发货申请质检信息子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index c856afd3d..80fba0473 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -119,6 +119,8 @@ import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 供应商发货记录主
 defineOptions({ name: 'SupplierdeliverRecordMain' })
 
@@ -273,19 +275,18 @@ const tableFormButton = async (val , row) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(tableObject.params)
      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 72c82bf0e..b14333648 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -21,15 +21,11 @@
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
   >
-  <template #rightBtn_right>
-      <el-tooltip
-        effect="dark"
-        content="查询条件"
-        placement="top-start"
-      >
-      <el-button @click="foldUpClick ">
-            <Icon :icon="visibleSearch ? 'ep:arrow-up' : 'ep:arrow-down'" />
-          </el-button>
+    <template #rightBtn_right>
+      <el-tooltip effect="dark" content="查询条件" placement="top-start">
+        <el-button @click="foldUpClick">
+          <Icon :icon="visibleSearch ? 'ep:arrow-up' : 'ep:arrow-down'" />
+        </el-button>
       </el-tooltip>
     </template>
   </TableHead>
@@ -229,6 +225,8 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -405,16 +403,16 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
 }
 // 为了折叠
 const visibleSearch = ref(false)
-const foldUpClick = ()=>{
+const foldUpClick = () => {
   visibleSearch.value = !visibleSearch.value
   tableObject.loading = true
   let timer = setTimeout(() => {
     tableObject.loading = false
-    if(timer){
+    if (timer) {
       clearTimeout(timer)
       timer = null
     }
-  }, 500);
+  }, 500)
 }
 
 const { tableObject, tableMethods } = useTable({
@@ -515,7 +513,7 @@ const butttondata = (row, $index) => {
     // 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'
@@ -612,14 +610,19 @@ const buttonTableClick = async (val, row) => {
     handleDelete(row.masterId)
   } else if (val == 'ssbq') {
     // 生成标签
-    detatableData.params = {
-      masterId: row.masterId
+    try {
+      tableObject.loading = true
+      detatableData.params = {
+        masterId: row.masterId
+      }
+      genLabelId.value = row.masterId
+      // await getDetailList()
+      await getGenerateLabelList(row)
+      count.value++
+      formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+    } finally {
+      tableObject.loading = false
     }
-    genLabelId.value = row.masterId
-    // await getDetailList()
-    await getGenerateLabelList(row)
-    count.value++
-    formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
   } else if (val == 'ressbq') {
     console.log('重新生成标签')
     // ElMessageBox.confirm(`<div style="color:red">
@@ -627,32 +630,42 @@ const buttonTableClick = async (val, row) => {
     //   </div>`,'提示',{
     //   dangerouslyUseHTMLString: true,
     // })
-    ElMessageBox.confirm(`<div>
+    tableObject.loading = true
+    ElMessageBox.confirm(
+      `<div>
     <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
     <br>
     <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
-    </div>`, '提示', {
-      confirmButtonText: t('ts.确 认'),
-      cancelButtonText: t('ts.取 消'),
-      dangerouslyUseHTMLString: true
-    })
-      .then(() => {
-        SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async (res) => {
-          if (res) {
-            // 生成标签
-            detatableData.params = {
-              masterId: row.masterId
+    </div>`,
+      '提示',
+      {
+        confirmButtonText: t('ts.确 认'),
+        cancelButtonText: t('ts.取 消'),
+        dangerouslyUseHTMLString: true
+      }
+    )
+      .then(async () => {
+        try {
+          await SupplierdeliverRequestMainApi.deleteOldLabels(row.masterId).then(async (res) => {
+            if (res) {
+              // 生成标签
+              detatableData.params = {
+                masterId: row.masterId
+              }
+              genLabelId.value = row.masterId
+              // await getDetailList()
+              count.value++
+              await getGenerateLabelList(row)
+              formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
             }
-            genLabelId.value = row.masterId
-            // await getDetailList()
-            count.value++
-            await getGenerateLabelList(row)
-            formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
-          }
-        })
+          })
+        } finally {
+          tableObject.loading = false
+        }
       })
       .catch(() => {
         console.info('操作取消')
+        tableObject.loading = false
       })
   } else if (val == 'point') {
     // 标签打印
@@ -679,7 +692,7 @@ const getGenerateLabelList = async (row) => {
     detatableData1.value = res
     detatableData1.value.forEach((item) => {
       // console.log(3333, item?.boxPackaging[0])
-      item.boxPackaging =item.boxPackaging ? item.boxPackaging:[]
+      item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
       let obj = item?.boxPackaging[0]
@@ -713,7 +726,11 @@ const footButtonClick = async (val) => {
       return
     }
     let isNext1 = detatableData1.value.some((item) => {
-      return item.secondPackQty && item.packQty && parseFloat(item.packQty) > parseFloat(item.secondPackQty)
+      return (
+        item.secondPackQty &&
+        item.packQty &&
+        parseFloat(item.packQty) > parseFloat(item.secondPackQty)
+      )
     })
     if (isNext1) {
       message.warning('托的包装数量要大于箱的包装数量,请修改')
@@ -762,7 +779,6 @@ const formSelectChangeLabel = (field, val, row) => {
   }
 }
 
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -1022,13 +1038,12 @@ const genRecords = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(
       tableObject.params
@@ -1036,7 +1051,7 @@ const handleExport = async () => {
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index c43617fdc..256066df1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -1,12 +1,13 @@
 <template>
   <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
-    <el-table
+    <div  v-loading="isLoading">
+<el-table
       :data="showTableData()"
       border
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
       v-if="tableData.length > 0 && dialogTableVisible == true"
-      v-loading="isLoading"
+     
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -173,10 +174,11 @@
       layout="total, prev, pager, next, jumper"
       :total="tableData.length"
     />
-    <template #footer>
-      <slot name="foorter"></slot>
+    <div style="text-align: right;margin-top:10px">
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-    </template>
+    </div>
+    </div>
+    
   </el-dialog>
 </template>
 <script setup lang="ts">
@@ -448,6 +450,11 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
   //  有父级托的时候
   if (type == 1) {
     // 在托下添加箱
+      // 在托下添加箱
+    if (parseFloat(twoRow.xNumber) == parseFloat(oneRow.otherNumber)) {
+      message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+      return
+    }
     twoRow.children.push({
       id: twoId.value,
       // xPoNumber:
diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue
index a5e636af5..700eeb1b5 100644
--- a/src/views/wms/supplierManage/invoicingcalendar/index.vue
+++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue
@@ -66,7 +66,8 @@ 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'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'Invoicingcalendar' })
 
 const message = useMessage() // 消息弹窗
@@ -205,19 +206,18 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await InvoicingcalendarApi.exportInvoicingcalendar(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
index 07ce15882..b40d4913e 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -69,6 +69,8 @@ import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import { formatDate } from '@/utils/formatTime'
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 采购索赔记录主
 defineOptions({ name: 'PurchaseclaimRecordMain' })
 
@@ -149,19 +151,18 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 9456dc032..7e1ca9c8d 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -78,7 +78,8 @@
   import TableHead from '@/components/TableHead/src/TableHead.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
   import { formatDate } from '@/utils/formatTime'
-
+  import { usePageLoading } from '@/hooks/web/usePageLoading'
+  const { loadStart, loadDone } = usePageLoading()
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })
 
@@ -413,13 +414,13 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue
index 914e8787c..1139a2c39 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue
@@ -65,7 +65,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 { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierApbalanceDetail' })
 
 const message = useMessage() // 消息弹窗
@@ -196,18 +197,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SupplierApbalanceDetailApi.exportSupplierApbalanceDetail(tableObject.params)
     download.excel(data, '供应商余额明细子.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 513463068..0012b238f 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -95,7 +95,8 @@ import AdjustmentDialog from '@/components/TableFormAdjustment/src/AdjustmentDia
 
 import {getJmreportBaseUrl} from "@/utils/systemParam";
 import {getAccessToken} from "@/utils/auth";
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierApbalanceMain' })
 
 const message = useMessage() // 消息弹窗
@@ -256,18 +257,17 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const data = await SupplierApbalanceMainApi.exportSupplierApbalanceMain(tableObject.params)
     download.excel(data, '供应商余额明细主.xlsx')
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index e3b10dcb3..db9995306 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -153,7 +153,8 @@ import * as PackageApi from "@/api/wms/package";
 import {getAccessToken} from "@/utils/auth";
 import {getJmreportBaseUrl} from "@/utils/systemParam";
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 // 供应商发票记录主
 defineOptions({ name: 'SupplierinvoiceRecordMain' })
 
@@ -302,7 +303,6 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => {
   }
 }
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   let rows:any = []
   selectionRows.value.forEach(item=>{
@@ -315,13 +315,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain({...tableObject.params,checkNums:rows})
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 4e1f90a26..db04d29ab 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -351,6 +351,8 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { accountantFormart } from '@/utils/formatter'
 
 import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierinvoiceRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -629,7 +631,7 @@ const butttondata = (row, $index) => {
     {
       label: t('ts.作废'),
       name: 'repeal',
-      hide: isShowMainButton(row, ['1', '3', '6']),
+      hide: isShowMainButton(row, ['1', '3', '6', '7']),
       type: 'danger',
       color: '',
       link: true, // 文本展现按钮
@@ -1162,7 +1164,6 @@ const genRecords = async (id: number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
  console.log(111)
   let rows: any = []
@@ -1187,13 +1188,13 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(paramsData)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 9dec5c5cd..35170828b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -152,7 +152,8 @@ import dayjs from 'dayjs'
   import { getJmreportBaseUrl } from '@/utils/systemParam'
   import { accountantFormart } from '@/utils/formatter'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
   defineOptions({ name: 'SupplierinvoiceRequestMain' })
 
   const message = useMessage() // 消息弹窗
@@ -312,7 +313,6 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
   }
 
   /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
     let rows:any = []
     selectionRows.value.forEach(item=>{
@@ -337,13 +337,13 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
       // 导出的二次确认
       await message.exportConfirm()
       // 发起导出
-      exportLoading.value = true
+      loadStart()
       const excelTitle = ref(route.meta.title)
       const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(paramsData)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
-      exportLoading.value = false
+      loadDone()
     }
   }
 
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index 7a36a738d..0981356d6 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -65,7 +65,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
-
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SupplierinvoiceInvoiced' })
 
 const message = useMessage() // 消息弹窗
@@ -265,19 +266,18 @@ const handleRefuse = async (id : number) => {
 }
 
 /** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    loadDone()
   }
 }