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

src/components/Detail/src/Detail.vue

@@ -12,6 +12,7 @@
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
         </div>
       </template>
+      <div v-loading="detailLoading">
         <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change"/>
         <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
           <Descriptions
@@ -185,6 +186,7 @@
             </ElScrollbar> 
           </ContentWrap>
         </div>
+      </div>
     </el-drawer>
     <!-- 表格弹窗 -->
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
@@ -1045,7 +1047,7 @@ const buttonBaseClick = (val, item) => {
     }
   }  else if (val.includes('export')) {
     // 刷新
-    emit('buttonBaseClick',val, item,tableObject)
+    emit('buttonBaseClick',val, item,tableObjectRef.value)
   } else if (val == 'refresh') {
     // 刷新
     getList()
@@ -1388,7 +1390,7 @@ watch(
       deep: true
     }
   )
-defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef}) // 提供 open 方法，用于打开弹窗
+defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef,detailLoading}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss">

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -822,14 +822,14 @@ const handleExportDetail = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementDetail(
       detailTableObject.params
     )
     download.excel(data, `客户对账单明细子【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 
@@ -839,14 +839,14 @@ const handleExportShareReconciliation = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementShareReconciliatioDetail(
       detailTableObject.params
     )
     download.excel(data, `模具分摊对账单子${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 // 子表导出对账差异
@@ -855,14 +855,14 @@ const handleExportReconciliation = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementCompareDetail(
       detailTableObject.params
     )
     download.excel(data, `对账差异【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 // 模具分摊对账单修改进屋金额