Merge branch 'hella_online_20240803' into master_hella

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`})
+}

src/api/qms/sampleCode/index.ts

@@ -49,8 +49,9 @@ 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 })
+    return request.downloadPost({ url: '/qms/sample-code/export-excel-senior', data })
   } else {
     return await request.download({ url: `/qms/sample-code/export-excel`, params })
   }

src/api/qms/samplingScheme/index.ts

@@ -41,8 +41,9 @@ 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 })
+    return request.downloadPost({ url: '/qms/sampling-scheme/export-excel-senior', data })
   } else {
     return await request.download({ url: `/qms/sampling-scheme/export-excel`, params })
   }

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 })

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

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 })

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 })

src/api/wms/productreceiptRecordMain/index.ts

@@ -25,6 +25,7 @@ export interface ProductreceiptRecordMainVO {
   toAreaTypes: string
   toAreaCodes: string
   available: string
+  inventoryStatus:string
 }
 
 // 查询制品收货记录主列表

src/api/wms/productredressJobMain/index.ts

@@ -90,8 +90,13 @@ export const abandonProductredressJobMain = async (id: number) => {
 
 // 导出制品回收任务主 Excel
 export const exportProductredressJobMain = async (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 = () => {

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' })
+}

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -45,7 +45,7 @@ export interface PurchasereceiptRecordDetailVO {
   interfaceType: string
   fromOwnerCode: string
   toOwnerCode: string
-  toBatch: string,
+  toBatch: string
   parentPackingNumber: string
   packingNumber: string
 }
@@ -61,7 +61,6 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
   }
 }
 
-
 // 查询采购拒收记录
 export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
   if (params.isSearch) {
@@ -73,7 +72,6 @@ export const getPurchasereceiptRecordDetailRefusePage = async (params) => {
   }
 }
 
-
 // 查询备件收货记录子列表
 export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
   if (params.isSearch) {
@@ -85,7 +83,6 @@ export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
   }
 }
 
-
 // 查询采购收货记录--退货筛选列表
 export const getPurchasereceiptRecordDetailPageReturn = async (params) => {
   if (params.isSearch) {
@@ -112,9 +109,15 @@ 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 })
+    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
+    })
   }
 }
 
@@ -125,7 +128,10 @@ export const getPurchasereceiptRecordDetailList = async (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
+  })
 }
 
 // 查询采购收货记录子详情
@@ -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 })
+}
+

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 })

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 })

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)}}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽

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'">

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"
+          </el-select>
-              :value="op[item.optionsValue] || op.value" :key="index" /> -->
+          <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

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({

src/locales/en-US.ts

@@ -1281,7 +1281,8 @@ export default {
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
     '确认撤销报工吗？': 'Are you sure to cancel the job application?',
-
+    '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity',
+    撤销报工成功:'Revocation of work report successful',
   },
 
 

src/locales/zh-CN.ts

@@ -1278,6 +1278,8 @@ export default {
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
     '确认撤销报工吗？': "确认撤销报工吗？",
+    '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量',
+    撤销报工成功:'撤销报工成功',
   },
 
 }

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',  //制品子件报废原因
 }

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, {

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()
   }
 }
 

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()
     }
   }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
     }
   }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

src/views/eam/itemApplyMain/index.vue

@@ -54,6 +54,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: '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()
     }
   }
 

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()
   }
 }
 

src/views/eam/itemInLocation/index.vue

@@ -47,6 +47,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: 'ItemInLocation' })
 
@@ -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()
     }
   }
 

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()
   }
 }
 

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()
   }
 }
 

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()
     }
   }
 

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()
   }
 }
 

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()
   }
 }
 

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()
     }
   }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }
 

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()
   }
 }