diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanSaveReqVO.java
index 3cea641..2f86601 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/materialplan/vo/MaterialPlanSaveReqVO.java
@@ -41,5 +41,4 @@ public class MaterialPlanSaveReqVO {
 
     @Schema(description = "备注")
     private String description;
-
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
index 30b6aa8..659bfab 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java
@@ -38,7 +38,7 @@ public class ProjectOrderDO extends BaseDO {
      * 项目编号，唯一
      */
     private String code;
-    /**
+    /**bubu
      * 单据状态 已保存/已送审/已审核/已启动/已打回/已终止
      *
      * 枚举 {@link TODO heli_project_order_status 对应的类}
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/screen/ScreenServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/screen/ScreenServiceImpl.java
index 6664ff0..4cf89ea 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/screen/ScreenServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/screen/ScreenServiceImpl.java
@@ -370,21 +370,32 @@ public class ScreenServiceImpl implements ScreenService {
         Calendar calendar = Calendar.getInstance();
         LocalDateTime firstDayInNewYearTime = LocalDateTime.of(calendar.get(Calendar.YEAR), 1, 1, 0, 0);
 
-        MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();
-        query.selectAll(ProjectOrderDO.class)
-//                .selectCount(ProjectOrderDO::getId, "projectCount")
-                .select("DATE_FORMAT(create_time, '%m') as projectMonth")
-                .ge(ProjectOrderDO::getCreateTime, firstDayInNewYearTime)
-                .eq(ProjectOrderDO::getProperty,1)
+//        MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();
+//        query.selectAll(ProjectOrderDO.class)
+////                .selectCount(ProjectOrderDO::getId, "projectCount")
+//                .select("DATE_FORMAT(create_time, '%m') as projectMonth")
+//                .ge(ProjectOrderDO::getCreateTime, firstDayInNewYearTime)
+//                .eq(ProjectOrderDO::getProperty,1)
+//                .eq(ProjectOrderDO::getIsSnapshot,0)
+//                .eq(ProjectOrderDO::getOrderStatus, ProjectOrderStatusEnum.APPROVE.getCode())
+////                .groupBy("t.business_line", "DATE_FORMAT(create_time, '%m')")
+//        ;
+//        List<ProjectOrderDO> projectOrderDOList = projectOrderMapper.selectList(query);
+        MPJLambdaWrapper<PlanSubDO> planQuery = new MPJLambdaWrapper<>();
+        planQuery.selectAll(PlanSubDO.class)
+                .select("DATE_FORMAT(t.create_time, '%m') as projectMonth")
+                .select("po.business_line as businessLine")
+                .leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId,PlanSubDO::getProjectId)
+                .ge(PlanSubDO::getCreateTime, firstDayInNewYearTime)
                 .eq(ProjectOrderDO::getIsSnapshot,0)
-                .eq(ProjectOrderDO::getOrderStatus, ProjectOrderStatusEnum.APPROVE.getCode())
-//                .groupBy("t.business_line", "DATE_FORMAT(create_time, '%m')")
-        ;
-        List<ProjectOrderDO> projectOrderDOList = projectOrderMapper.selectList(query);
+                .innerJoin(PlanDO.class, "a", PlanDO::getId, PlanSubDO::getProjectPlanId)
+                .notIn(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode(), ProjectPlanStatusEnum.COMPLETE.getCode());
+        List<PlanSubDO> planSubDOS = planSubMapper.selectList(planQuery);
 
-        Map<Integer, List<ProjectOrderDO>> countWithByBusinessLineGroupMonth = projectOrderDOList.stream().collect(Collectors.groupingBy(ProjectOrderDO::getProjectMonth));
+
+        Map<Integer, List<PlanSubDO>> countWithByBusinessLineGroupMonth = planSubDOS.stream().collect(Collectors.groupingBy(PlanSubDO::getProjectMonth));
         months.forEach(month -> {
-            List<ProjectOrderDO> monthProjectList = countWithByBusinessLineGroupMonth.get(Integer.valueOf(month.replace("月","")));
+            List<PlanSubDO> monthProjectList = countWithByBusinessLineGroupMonth.get(Integer.valueOf(month.replace("月","")));
             if (CollUtil.isEmpty(monthProjectList)){
                 total.add(0);
                 black.add(0);
@@ -393,7 +404,7 @@ public class ScreenServiceImpl implements ScreenService {
             }
             int coloredCount = 0;
             int blackCount=0;
-            Map<String, List<ProjectOrderDO>> countWithByBusinessLine = monthProjectList.stream().collect(Collectors.groupingBy(ProjectOrderDO::getBusinessLine));
+            Map<String, List<PlanSubDO>> countWithByBusinessLine = monthProjectList.stream().collect(Collectors.groupingBy(PlanSubDO::getBusinessLine));
             if(CollUtil.isNotEmpty(countWithByBusinessLine.get(BusinessLineEnum.BLACK.getCode()))){
                 blackCount = countWithByBusinessLine.get(BusinessLineEnum.BLACK.getCode()).size()  ;
             }
@@ -646,10 +657,18 @@ public class ScreenServiceImpl implements ScreenService {
         data[0][2] = processDesignMapper.selectList(designQuery).size();
 
         // 在制项目数量：取系统中《生产计划》的状态不为“已完成”或“已终止”的生产计划的子项目的个数和；
+
+        //2025 04 10 更改，改为查询一年的数据
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime currentYearStart = LocalDateTime.of(now.getYear(), 1, 1, 0, 0, 0);
+
+
         MPJLambdaWrapper<PlanSubDO> planQuery = new MPJLambdaWrapper<>();
         planQuery.selectAll(PlanSubDO.class)
+                .ge(PlanSubDO::getCreateTime,currentYearStart)
                 .innerJoin(PlanDO.class, "a", PlanDO::getId, PlanSubDO::getProjectPlanId)
                 .notIn(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode(), ProjectPlanStatusEnum.COMPLETE.getCode());
+
         data[0][3] = planSubMapper.selectList(planQuery).size();
 
         screenDO.setData(JSON.toJSONString(data));
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
index b42d7c3..7e6d7b3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -655,6 +655,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 
         if(!updateList.isEmpty()){
             for (TaskDispatchDetailDO taskDispatchDetailDO : updateList) {
+
                 if (taskDispatchDetailDO.getDispatchType() == 2){
                     taskDispatchDetailMapper.updateOwnerAndPostIdById(taskDispatchDetailDO.getId(),1);
                 }else {
diff --git a/mes-module-infra/mes-module-infra-biz/src/main/java/com/chanko/yunxi/mes/module/infra/service/file/FileServiceImpl.java b/mes-module-infra/mes-module-infra-biz/src/main/java/com/chanko/yunxi/mes/module/infra/service/file/FileServiceImpl.java
index 76b1f15..50998b6 100644
--- a/mes-module-infra/mes-module-infra-biz/src/main/java/com/chanko/yunxi/mes/module/infra/service/file/FileServiceImpl.java
+++ b/mes-module-infra/mes-module-infra-biz/src/main/java/com/chanko/yunxi/mes/module/infra/service/file/FileServiceImpl.java
@@ -65,7 +65,8 @@ public class FileServiceImpl implements FileService {
         file.setName(name);
         file.setPath(path);
         file.setUrl(url);
-        file.setPreviewUrl(url.replace("/admin-api/infra/file/5/get/","/fileview/"));
+        String[] split = url.split("/");
+        file.setPreviewUrl(url.replace("/"+split[3]+"/"+split[4]+"/"+split[5]+"/"+split[6]+"/"+split[7]+"/","/fileview/"));
         file.setType(type);
         file.setSize(content.length);
         fileMapper.insert(file);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
index 500ef76..77a5a5b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/PriceQuoteRecord/detail.vue
@@ -645,7 +645,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+   const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue
index 88ca0f7..7c6a074 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue
@@ -301,7 +301,7 @@ ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uplo
 				            <Icon icon="ep:upload-filled" />上传附件
 				          </el-button>
 				        </el-upload>
-				
+
 				      </el-col>
 				      <el-table :data="formData.attachments" v-loading.fullscreen.lock="uploading" element-loading-text="附件上传中..." element-loading-background="rgba(122, 122, 122, 0.6)" class="hl-table">
 				        <el-table-column prop="name" label="文件名称" align="center" />
@@ -475,7 +475,7 @@ const refreshAttachments = (files, type) => {
   formData.value.attachments = formData.value.attachments.filter((value, index, array) => {
     return value.businessFileType != type || value.id
   })
-  
+
 
   for (let i = 0; i < files.length; i++) {
     let file = files[i]
@@ -534,7 +534,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
@@ -552,7 +553,7 @@ const open = async (type: string, id?: number) => {
   formType.value = type
   resetForm()
   console.log("打印typ");
-  
+
   console.log(type);
 
   // 修改时，设置数据
@@ -586,7 +587,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as CustomerApi.CustomerVO
-	
+
 	let orderId =formData.value.id;
     data.status = data.status == true ? 1 : 2
     if (formType.value === 'create') {
@@ -596,8 +597,8 @@ const submitForm = async () => {
       await CustomerApi.updateCustomer(data)
       message.success(t('common.updateSuccess'))
     }
-	
-	
+
+
 	// 上传附件
 	if (contractUploadFiles.value.length > 0) {
 	  contractUploadData.value.businessId = orderId
@@ -607,18 +608,18 @@ const submitForm = async () => {
 	  protocolUploadData.value.businessId = orderId
 	  await protocolUploadRef.value!.submit()
 	}
-	
+
 	// 如非保存 返回列表页
 	if (active != 'SAVE') {
 	  router.back()
 	} else {
-	
+
 	  // 成功后刷新
 	  query.active = 'update'
 	//if(query.active != 'update'){
 	  query.id = orderId
 	//}
-	  
+
 	  if (sumbefore.value == 0) {
 	    reload()
 	  }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
index 3bd7d2b..2ffe58e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
@@ -646,9 +646,9 @@ const submitForm = async (operate) => {
     var data = formData.value as unknown as DeliverOrderApi.DeliverOrderVO
     // if(data.deliverOrderSubs.length >1){
     //   data.deliverOrderSubs.forEach(element => {
-    //     element.saleOrderSubId = element.projectOrderId; 
+    //     element.saleOrderSubId = element.projectOrderId;
     //   });
-      
+
     // }
     const orderId = await DeliverOrderApi.operateDeliverOrder(data)
     message.success(t('common.operationSuccess'))
@@ -876,7 +876,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/inspectionreport/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/inspectionreport/detail.vue
index 514bf84..56d5933 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/inspectionreport/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/inspectionreport/detail.vue
@@ -49,7 +49,8 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col v-if="active != 'detail'">
-                <el-upload ref="compositionUploadRef" :file-list="compositionUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="compositionUploadRef" :file-list="compositionUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="compositionUploadData" :on-change="compositionUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -57,7 +58,8 @@
                     <Icon icon="ep:upload-filled" />上传材质报告
                   </el-button>
                 </el-upload>
-                <el-upload ref="heatUploadRef" :file-list="heatUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="heatUploadRef" :file-list="heatUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="heatUploadData" :on-change="heatUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -65,7 +67,8 @@
                     <Icon icon="ep:upload-filled" />上传热处理报告
                   </el-button>
                 </el-upload>
-                <el-upload ref="scanUploadRef" :file-list="scanUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="scanUploadRef" :file-list="scanUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="scanUploadData" :on-change="scanUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -73,7 +76,8 @@
                     <Icon icon="ep:upload-filled" />上传扫描报告
                   </el-button>
                 </el-upload>
-                <el-upload ref="triUploadRef" :file-list="triUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="triUploadRef" :file-list="triUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="triUploadData" :on-change="triUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -81,7 +85,8 @@
                     <Icon icon="ep:upload-filled" />上传三坐标检测报告
                   </el-button>
                 </el-upload>
-                <el-upload ref="certificateUploadRef" :file-list="certificateUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="certificateUploadRef" :file-list="certificateUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="certificateUploadData" :on-change="certificateUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -118,7 +123,7 @@
       </el-card>
 
     </el-form>
-    <div class="text-center hl-footer">
+    <div class="hl-footer text-center">
       <el-button @click="goback" size="large">取 消</el-button>
       <el-button v-if="active != 'detail'" @click="submitForm('SAVE')" type="primary" :disabled="formLoading" size="large">保 存</el-button>
     </div>
@@ -421,7 +426,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
index 97512e4..74ccaa3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
@@ -77,7 +77,8 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col v-if="active != 'detail'">
-                <el-upload ref="uploadRef" :file-list="uploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="uploadRef" :file-list="uploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="uploadData" :on-change="uploadChange" class="upload-file-uploader">
@@ -107,7 +108,7 @@
       </el-card>
 
     </el-form>
-    <div class="text-center hl-footer">
+    <div class="hl-footer text-center">
       <el-button @click="goback" size="large">取 消</el-button>
       <el-button v-if="active != 'detail' && formData.status == 1" @click="submitForm('SAVE')" type="primary" :disabled="formLoading" size="large">保 存</el-button>
       <el-button v-if="active != 'detail' && formData.status == 1" @click="submitForm('SUBMIT')" type="success" :disabled="formLoading" size="large">提 交</el-button>
@@ -276,7 +277,8 @@ const uploadData = ref({
 })
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialFormUpld.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialFormUpld.vue
index 3a82b12..22d839a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialFormUpld.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialFormUpld.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <template #footer>
-		
+
 		<el-card class="hl-incard" :class="{ 'alter-class': fieldHasAlter('attachments') }">
 		                <el-upload
 ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uploadUrl" :headers="{
@@ -12,7 +12,7 @@ ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uplo
 		                    <Icon icon="ep:upload-filled" />上传附件
 		                  </el-button>
 		                </el-upload>
-		
+
 		              <el-table :data="formData.attachments" v-loading.fullscreen.lock="uploading" element-loading-text="附件上传中..." element-loading-background="rgba(122, 122, 122, 0.6)" class="hl-table">
 		                <el-table-column prop="name" label="文件名称" align="center" />
 		                <el-table-column prop="createTime" align="center" label="上传时间" :formatter="dateFormatter" />
@@ -29,7 +29,7 @@ ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uplo
 		              </el-table>
 		            </el-card>
 		<el-button type="success"  @click="submitForm">确定</el-button>
-		
+
     </template>
   </Dialog>
 </template>
@@ -108,7 +108,8 @@ formData.value = await MaterialApi.getMaterial(id)
 }
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
@@ -119,7 +120,7 @@ const contractUploadChange =async  (file, files) => {
   //   contractUploadData.value.businessId = formData.value.id
   //   await contractUploadRef.value!.submit()
   // }
-  
+
 }
 const refreshAttachments = (files, type) => {
 	// formData.value.attachments=[]
@@ -170,7 +171,7 @@ const refreshAttachments = (files, type) => {
     }
     reload()
     uploading.value = false
-	
+
   }
 }
 
@@ -181,7 +182,7 @@ async function submitForm() {
   }else{
 	  dialogVisible.value=false
   }
-  
+
 }
 
 // 处理单个文件上传失败的情况
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
index 2f4cc04..b738788 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
@@ -457,7 +457,7 @@ const getBoomList = async (arrBoom) => {
       formData.value.boomItemDOList.push(item)
     }
 
-    
+
   })
 }
 
@@ -568,7 +568,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/boom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/boom.vue
index dcf05d8..f8d0e58 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/boom.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/boom.vue
@@ -18,8 +18,8 @@
       </el-form>
     </ContentWrap>
     <el-card class="hl-table">
-      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
-        <el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable" />
+      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" :reserve-selection="true"   @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
+        <el-table-column type="selection" width="55"  :selectable="row=>chkboxEnable" />
         <!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
         <el-table-column label="序号" type="index" min-width="120" align="center" />
         <el-table-column prop="materialName" label="零件名称" min-width="120" align="center" />
@@ -47,6 +47,7 @@ import { ref } from 'vue'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as MaterialPlanBoomApi from '@/api/heli/materialplanboom'
 import { ElTable } from 'element-plus'
+import { cursorTo } from 'readline'
 
 const chkboxEnable = ref(true)
 
@@ -61,10 +62,64 @@ const planIdInit = ref()
 
 const multipleTable = ref<InstanceType<typeof ElTable>>()
 const multipleSelection = ref([])
+const nowPageIds = ref([])
+const storage = ref(false)
 const handleSelectionChange = (val: []) => {
-  multipleSelection.value = val
-}
+  if(selectedRowBeforeKeys.value == null || selectedRowBeforeKeys.value.length == 0  ){
+       selectedRowNowKeys.value = val;
+      selectedRowBeforeKeys.value = val;
+      multipleSelection.value = selectedRowBeforeKeys.value
+     
+  }else{
+    if(val != null && val.length > 0){
+      //对比一下，看看多了还是少了，多了selectedRowBeforeKeys.value就添加那个多了的元素，少了selectedRowBeforeKeys.value就移除不同的元素 然后 selectedRowNowKeys.value = val;
+      // 提取新数据中的ID数组
+      const newIds = val.map(item => item.id);
+      // 提取当前页已选中的ID数组
+      const currentIds = selectedRowNowKeys.value.map(item => item.id);
+      // 提取之前所有页已选中的ID数组
+      const beforeIds = selectedRowBeforeKeys.value.map(item => item.id);
+      // 找出在新数据中但不在当前页已选中数组中的ID，这些是需要添加到之前选中数组中的
+      const idsToAdd = newIds.filter(id => !currentIds.includes(id));
+      // 找出在当前页已选中但不在新数据中的ID，这些是需要从之前选中数组中移除的
+      const idsToRemove = currentIds.filter(id => !newIds.includes(id));
+      // 添加新的ID到之前选中数组中
+      idsToAdd.forEach(id => {
+        val.forEach(item =>{
+          if(item.id == id){
+            selectedRowBeforeKeys.value.push(item);
+          }
+        })
+      });
+      // 从之前选中数组中移除不再存在的ID
+      idsToRemove.forEach(id => {
+        const index = beforeIds.indexOf(id);
+        if (index !== -1) {
+          selectedRowBeforeKeys.value.splice(index, 1);
+        }
+      });
+    multipleSelection.value = selectedRowBeforeKeys.value
+    selectedRowNowKeys.value = val;
+      }
+  
+ 
+  }
 
+  // if(selectedRowBeforeKeys.value == null || selectedRowBeforeKeys.value.length == 0){
+  //   selectedRowBeforeKeys.value = val
+  // }else{
+  //   val.forEach(item => {
+  //     const isIdExist = selectedRowKeys.value.some(it => it.id === item.id);
+  //     if (!isIdExist) {
+  //       selectedRowKeys.value.push(item);
+  //     }
+  //   });
+  // }
+  // multipleSelection.value = val
+}
+const selectedRowKeys = ref([]);
+const selectedRowBeforeKeys = ref([]);
+const selectedRowNowKeys = ref([]);
 const clickRow = (row: any) => {
   if (chkboxEnable.value) {
     if (row) {
@@ -76,7 +131,7 @@ const clickRow = (row: any) => {
 }
 //指定key值,数据更新之后保留之前选中的数据
 const getRowKeys = (row) => {
-  return row.matId
+  return row.id
 }
 
 const queryReqVo: any = reactive({
@@ -88,9 +143,22 @@ const queryReqVo: any = reactive({
 })
 /** 搜索按钮操作 */
 const handleQuery = async () => {
+  selectedRowNowKeys.value = []
   const data = await MaterialPlanBoomApi.getBoomDetailList(queryReqVo)
+  nowPageIds.value = data.list.map(item => item.id);
+  storage.value = true;
   list.value = data.list
+
   total.value = data.total
+  nextTick(() => {
+    multipleSelection.value.forEach((key) => {
+        const row = list.value.find(item => item.id === key.id);
+        if (row) {
+          selectedRowNowKeys.value.push(key)
+          multipleTable.value!.toggleRowSelection(row, true);
+        }
+      });
+    });
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
index 47adc1e..5062809 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/detail.vue
@@ -522,6 +522,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
+       const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];
     const data = await downloadFile(url)
     download.any(data, name)
   }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
index 273646f..8be5866 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue
@@ -476,7 +476,7 @@ const getMatItemList = async (arrMaterial) => {
             }
           }
           if(!insert){
-            formData.value.matItemDOList.push(newData)          
+            formData.value.matItemDOList.push(newData)
           }else{
             ElMessageBox.alert(
               `物料：`+item.materialCode+'　'+item.materialName,
@@ -515,7 +515,7 @@ const getMatItemList = async (arrMaterial) => {
             }
           }
           if(!insert){
-            formData.value.matItemDOList.push(newData)          
+            formData.value.matItemDOList.push(newData)
           }else{
             ElMessageBox.alert(
               `物料：`+item.materialCode+'　'+item.materialName,
@@ -531,7 +531,7 @@ const getMatItemList = async (arrMaterial) => {
           formData.value.matItemDOList.push(newData)
         }
       }
-      
+
       // formData.value.matItemDOList.push(item)
     }
   })
@@ -644,7 +644,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
@@ -826,7 +827,7 @@ const saveForm = async () => {
 const judgeSubmitMsg = () => {
   var isRepet = false;
   if (formData.value.matItemDOList != null && formData.value.matItemDOList.length > 0) {
-    const matIdSet = new Set(); 
+    const matIdSet = new Set();
     for (let i = 0; i < formData.value.matItemDOList.length; i++) {
       const matId = formData.value.matItemDOList[i].matId;
       if (matIdSet.has(matId)) {
@@ -856,7 +857,7 @@ const judgeSubmitMsg = () => {
   //           center: true
   //         }
   //       );
-      
+
   // }
   return isRepet;
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/detail.vue
index 99407dd..9acabf1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/detail.vue
@@ -460,12 +460,12 @@ link type="primary" size="small" :disabled="formData.status == 2"
 
     </el-form>
     <!-- <div class="hl-footer text-center">
-       
-      
+
+
       <el-button @click="saveForm" v-if="formData.status !== 2 && formData.status !== 3" type="primary" size="large">保
         存</el-button>
-       <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">提交</el-button> 
-	   <el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button> 
+       <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">提交</el-button>
+	   <el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button>
     </div> -->
   </el-card>
   <!-- 表单弹窗：物料列表 -->
@@ -589,7 +589,7 @@ const handleSelectedMaterialPlanMat = (arr) => {
   });
 };
 const handleSelectedMaterialPlanBoom = async (arrBoom) => {
-  //debugger  
+  //debugger
   const existingBoomDetailIds = new Set(formData.value.boomItemDOList.map(boom => boom.boomDetailId));
 
   arrBoom.forEach((item) => {
@@ -738,7 +738,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
@@ -928,8 +929,8 @@ const handleDeleteBoom = (index: number) => {
 }
 
 const closeForm = async () => {
-	
-	
+
+
   var userId = useUserStore().getUser.id
   var iftrue = await OutsourceStockApi.outCancelWeiWai(formData.value.id,userId)
   reload()
@@ -1017,7 +1018,7 @@ const submitForm = async () => {
 		var iftrue = await OutsourceStockApi.outYanCaiLiao(formData.value.id,userId)
 		reload()
 	}
-  
+
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const supplierInit = ref()
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
index 9ce1365..099e614 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
@@ -306,7 +306,7 @@ ref="subBoomPlanFormRef" :model="formData.boomItemDOList" :rules="subBoomPlanFor
                     <template #header><span class="hl-table_header">*</span>本次到货数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.currentCount">
-                        <el-input-number 
+                        <el-input-number
 style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量"
                           @change="handleEstimatedPrice" :min="0" :precision="2" />
                       </el-form-item>
@@ -622,7 +622,7 @@ const handleSelectedMaterialPlanMat = (arr) => {
   });
 };
 const handleSelectedMaterialPlanBoom = async (arrBoom) => {
-  //debugger  
+  //debugger
   const existingBoomDetailIds = new Set(formData.value.boomItemDOList.map(boom => boom.boomDetailId));
 
   arrBoom.forEach((item) => {
@@ -771,7 +771,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
@@ -1085,7 +1086,7 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
-// 提交入库方法 
+// 提交入库方法
 const inWarehouse = async () => {
   //先判断是加工件还是原材料
   if (formData.value.goodsType === 2) {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/firstAdd.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/firstAdd.vue
index 69741df..fe3749a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/firstAdd.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/firstAdd.vue
@@ -307,8 +307,8 @@ ref="subBoomPlanFormRef" :model="formData.boomItemDOList111" :rules="subBoomPlan
                     <template #header><span class="hl-table_header">*</span>本次到货数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!">
-                        <el-input-number 
-style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量" :rules="subOutSourceMatFormRules.currentCount" 
+                        <el-input-number
+style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量" :rules="subOutSourceMatFormRules.currentCount"
                           @change="handleEstimatedPrice" :min="0" :precision="2" />
                       </el-form-item>
                     </template>
@@ -489,7 +489,7 @@ link type="primary" size="small" :disabled="formData.status == 2 || formData.sta
          除</el-button> -->
       <el-button @click="saveForm" type="primary" size="large">保
         存</el-button>
-      <!-- <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">提交</el-button> 
+      <!-- <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !== 3">提交</el-button>
       <el-button @click="closeForm" v-if="formData.status == 2" size="large">取消提交</el-button>  -->
     </div>
   </el-card>
@@ -615,7 +615,7 @@ const handleSelectedMaterialPlanMat = (arr) => {
   });
 };
 const handleSelectedMaterialPlanBoom = async (arrBoom) => {
-  //debugger  
+  //debugger
   const existingBoomDetailIds = new Set(formData.value.boomItemDOList.map(boom => boom.boomDetailId));
 
   arrBoom.forEach((item) => {
@@ -764,7 +764,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue
index 9e23d21..749787e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/bomDetail.vue
@@ -561,7 +561,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index 0d46321..5659462 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -1830,7 +1830,8 @@ type="textarea" v-model="formData.activeOpinion" placeholder="请输入打回原
 
 	// 下载文件
 	const downloadAttachment = async (name, url) => {
-		const data = await downloadFile(url)
+		       const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
 		download.any(data, name)
 	}
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/reportDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/reportDialog.vue
index 82d2ded..7869228 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/reportDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/reportDialog.vue
@@ -5,7 +5,8 @@
         <el-col>
           <el-card class="hl-incard">
             <el-col>
-              <el-upload ref="uploadRef" :file-list="uploadFiles" multiple :action="uploadUrl" :headers="{
+              <el-upload
+ref="uploadRef" :file-list="uploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="uploadData" :on-change="uploadChange" class="upload-file-uploader">
@@ -108,7 +109,8 @@ const submitForm = async () => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/auditdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/auditdetail.vue
index b57c29a..dc3e46e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/auditdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/auditdetail.vue
@@ -877,7 +877,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
index 87098d2..80d0acd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue
@@ -920,7 +920,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
index c14df42..48f847e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
@@ -932,7 +932,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+    const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/renshiFile/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/renshiFile/index.vue
index 7954c6e..21b1d98 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/renshiFile/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/renshiFile/index.vue
@@ -17,11 +17,12 @@
           class="!w-240px"
         />
       </el-form-item>
-     
+
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-		<el-upload ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uploadUrl" :headers="{
+		<el-upload
+ref="contractUploadRef" :file-list="contractUploadFiles" multiple  :action="uploadUrl" :headers="{
 		    Authorization: 'Bearer ' + getAccessToken(),
 		    'tenant-id': getTenantId()
 		  }" name="files" :show-file-list="false" :auto-upload="false" :data="contractUploadData" :on-change="contractUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
@@ -59,8 +60,8 @@
     /> -->
   </ContentWrap>
 
-  
-  
+
+
 </template>
 <script setup lang="ts">
 
@@ -99,7 +100,7 @@ const queryParams = reactive({
   projectName: undefined,
   pgUser: undefined,
   pgDatetime: [],
-  
+
 })
 
 const formData = ref({
@@ -125,7 +126,7 @@ const submitForm = async () => {
 	  await protocolUploadRef.value!.submit()
 	}
 	reload()
-	
+
 }
 
 
@@ -202,7 +203,7 @@ const refreshAttachments = (files, type) => {
   formData.value.attachments = formData.value.attachments.filter((value, index, array) => {
     return value.businessFileType != type || value.id
   })
-  
+
 
   for (let i = 0; i < files.length; i++) {
     let file = files[i]
@@ -237,8 +238,8 @@ const refreshAttachments = (files, type) => {
     reload()
     uploading.value = false
   }
-  
-  
+
+
 }
 
 // 删除附件
@@ -263,7 +264,8 @@ const handleDeleteAttachment = async (index, type) => {
 
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  const data = await downloadFile(url)
+         const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
   download.any(data, name)
 }
 
@@ -334,4 +336,4 @@ onMounted(async () => {
   await getList()
   userList.value = await UserApi.getSimpleUserList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index b2b69bf..b28ca5b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -28,9 +28,11 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="stockInType" label="入库类型">
-                  <el-select v-model="formData.stockInType" clearable style="width: 100%" @change="handleStockType"
-                    v-bind:disabled="ctrView || ctrSave">
-                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)" :key="dict.value"
+                  <el-select
+v-model="formData.stockInType" clearable style="width: 100%" @change="handleStockType"
+                    :disabled="ctrView || ctrSave">
+                    <el-option
+v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)" :key="dict.value"
                       :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
@@ -42,7 +44,8 @@
               <el-col :span="24">
                 <el-form-item prop="industry" label="单据状态">
                   <el-select v-model="formData.status" placeholder="下拉选择" clearable class="!w-700px" disabled>
-                    <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)" :key="dict.value"
+                    <el-option
+v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)" :key="dict.value"
                       :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
@@ -52,9 +55,9 @@
               <el-col :span="24">
                 <el-form-item prop="headerNo" label="上游单号">
                   <div class="!w-700px">
-                    <el-input v-model="formData.headerNo" @click.prevent="handleClick"  v-bind:disabled="ctrView || ctrSave || enableHeadNo">
+                    <el-input v-model="formData.headerNo" @click.prevent="handleClick"  :disabled="ctrView || ctrSave || enableHeadNo">
                       <template #append><el-button
-                        :icon="Search" v-bind:disabled="ctrView || ctrSave || enableHeadNo"
+                        :icon="Search" :disabled="ctrView || ctrSave || enableHeadNo"
                         @click="openProjectPurchaseorderDialog" /></template>
                     </el-input>
                   </div>
@@ -69,7 +72,8 @@
               <el-col :span="24">
                 <el-form-item label="单据日期" prop="createTime">
                   <!-- {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm:ss') }} -->
-                  <el-date-picker v-model="formData.createTime" value-format="x" placeholder="单据日期" disabled
+                  <el-date-picker
+v-model="formData.createTime" value-format="x" placeholder="单据日期" disabled
                     class="!w-400px" />
                 </el-form-item>
               </el-col>
@@ -77,8 +81,9 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="whId" label="入库仓库">
-                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @change="handleWh"
-                    v-bind:disabled="ctrView || ctrSave">
+                  <el-select
+v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @change="handleWh"
+                    :disabled="ctrView || ctrSave">
                     <el-option v-for="dict in whList" :key="dict.id" :label="dict.whName" :value="dict.id" />
                   </el-select>
                 </el-form-item>
@@ -89,8 +94,9 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="description">
-              <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200"
-                v-bind:disabled="ctrView || ctrSave" />
+              <el-input
+type="textarea" v-model="formData.description" show-word-limit maxlength="200"
+                :disabled="ctrView || ctrSave" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -105,10 +111,12 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" @click="openMatForm"
-                  v-bind:disabled="ctrView || ctrSave">新增</el-button>
+                <el-button
+class="hl-addbutton" type="primary" size="large" @click="openMatForm"
+                  :disabled="ctrView || ctrSave">新增</el-button>
               </el-col>
-              <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
+              <el-form
+ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules"
                 v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
                   <el-table-column type="index" label="序号" min-width="80" align="center" fixed />
@@ -116,7 +124,7 @@
                     <template #header> <span class="hl-table_header">*</span> 物料编码</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matCode`" :rules="subFormRules.matCode" class="mb-0px!">
-                          <el-input class="!w-265px" placeholder="物料编码" v-bind:disabled="true || ctrView || ctrSave" v-model="scope.row.matCode" readonly>
+                          <el-input class="!w-265px" placeholder="物料编码" :disabled="true || ctrView || ctrSave" v-model="scope.row.matCode" readonly>
                             <!-- <template #append ><el-button @click="openMatForm" > <Icon icon="ep:search" class="mr-5px" /> </el-button></template> -->
                           </el-input>
                       </el-form-item>
@@ -145,8 +153,9 @@
 
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
-                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)"
-                          v-bind:disabled="ctrView || ctrSave">
+                        <el-select
+v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="handleRg(scope)"
+                          :disabled="ctrView || ctrSave">
                           <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rg_name" :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -158,9 +167,11 @@
 
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%"
-                          v-bind:disabled="ctrView || ctrSave">
-                          <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name"
+                        <el-select
+v-model="scope.row.pnId" placeholder="" style="width: 100%"
+                          :disabled="ctrView || ctrSave">
+                          <el-option
+v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name"
                             :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -171,9 +182,10 @@
                     <template #header> <span class="hl-table_header">*</span> 入库数量 </template>
 
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                      <el-form-item
+:prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
                         class="mb-0px!">
-                        <el-input v-model="scope.row.storageOkQty" v-bind:disabled="ctrView || ctrSave" />
+                        <el-input v-model="scope.row.storageOkQty" :disabled="ctrView || ctrSave" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -182,9 +194,10 @@
                     <template #header> <span class="hl-table_header">*</span> 入库单价 </template>
 
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.price`" :rules="subFormRules.price"
+                      <el-form-item
+:prop="`${scope.$index}.price`" :rules="subFormRules.price"
                                     class="mb-0px!">
-                        <el-input v-model="scope.row.price" v-bind:disabled="ctrView || ctrSave" />
+                        <el-input v-model="scope.row.price" :disabled="ctrView || ctrSave" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -193,23 +206,24 @@
                     <template #header>入库单价 </template>
 
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.price`"
+                      <el-form-item
+:prop="`${scope.$index}.price`"
                                     class="mb-0px!">
-                        <el-input v-model="scope.row.price" v-bind:disabled="ctrView || ctrSave" />
+                        <el-input v-model="scope.row.price" :disabled="ctrView || ctrSave" />
                       </el-form-item>
                     </template>
                   </el-table-column>
                   <el-table-column prop="lotNo" label="批次号" align="center" min-width="120" v-if="false">
 
                     <template #default="scope">
-                      <el-input v-model="scope.row.lotNo" v-bind:disabled="ctrView || ctrSave" />
+                      <el-input v-model="scope.row.lotNo" :disabled="ctrView || ctrSave" />
                     </template>
                   </el-table-column>
 
                   <el-table-column prop="projectSubName" label="子项目名称" align="center" min-width="120">
 
                     <template #default="scope">
-                      <el-input v-model="scope.row.projectSubName" v-bind:disabled="ctrView || ctrSave"  readonly>
+                      <el-input v-model="scope.row.projectSubName" :disabled="ctrView || ctrSave"  readonly>
                         <template #append ><el-button @click="openProjectForm(scope)" > <Icon icon="ep:search" class="mr-5px" /> </el-button></template>
                       </el-input>
                     </template>
@@ -217,14 +231,15 @@
                   <el-table-column prop="description" label="备注" align="center" min-width="180">
 
                     <template #default="scope">
-                      <el-input v-model="scope.row.description" v-bind:disabled="ctrView || ctrSave" />
+                      <el-input v-model="scope.row.description" :disabled="ctrView || ctrSave" />
                     </template>
                   </el-table-column>
                   <el-table-column label="操作" align="center" min-width="120" fixed="right">
 
                     <template #default="scope">
-                      <el-button link type="danger" @click.prevent="handleDelete2(scope.$index)"
-                        v-bind:disabled="ctrView || ctrDelete">
+                      <el-button
+link type="danger" @click.prevent="handleDelete2(scope.$index)"
+                        :disabled="ctrView || ctrDelete">
                         删除
                       </el-button>
                     </template>
@@ -245,18 +260,20 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :headers="{
         Authorization: 'Bearer ' + getAccessToken(),
         'tenant-id': getTenantId()
       }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData" :on-change="matUploadChange"
                   :on-error="handleError" :on-success="handleSuccess" :before-upload="before"
                   class="upload-file-uploader">
-                  <el-button type="primary" v-bind:disabled="ctrView || ctrSave">
+                  <el-button type="primary" :disabled="ctrView || ctrSave">
                     <Icon icon="ep:upload-filled" />上传
                   </el-button>
                 </el-upload>
               </el-col>
-              <el-table :data="formData.attachments" class="hl-table" v-loading.fullscreen.lock="uploading"
+              <el-table
+:data="formData.attachments" class="hl-table" v-loading.fullscreen.lock="uploading"
                 element-loading-text="附件上传中..." element-loading-background="rgba(122, 122, 122, 0.6)">
                 <el-table-column prop="name" label="文件名称" align="center">
                   <!-- <template #default="scope">
@@ -269,11 +286,13 @@
                 <el-table-column label="操作" align="center">
 
                   <template #default="scope">
-                    <el-button link type="danger" size="small" v-bind:disabled="ctrView || ctrDelete"
+                    <el-button
+link type="danger" size="small" :disabled="ctrView || ctrDelete"
                       @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)">
                       删除
                     </el-button>
-                    <el-button link type="primary" size="small" v-bind:disabled="ctrView || ctrDelete"
+                    <el-button
+link type="primary" size="small" :disabled="ctrView || ctrDelete"
                       @click="downloadAttachment(scope.row.name, scope.row.url)">
                       下载
                     </el-button>
@@ -329,7 +348,7 @@
         </el-row>
       </el-card>
     </el-form>
-    <div class="text-center hl-footer">
+    <div class="hl-footer text-center">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
         存</el-button>
@@ -693,7 +712,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 4ebc8f9..d15fff1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -842,7 +842,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
index 67a5437..d9d50e6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue
@@ -770,7 +770,9 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index 443b47b..198b56f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -138,8 +138,8 @@
                         <el-input v-model="scope.row.storageOkQty" @change="(val)=>handleSub(val,scope)" :disabled="ctrView || ctrSave" />
                       </el-form-item>
                     </template>
-                  </el-table-column> 
-				  
+                  </el-table-column>
+
 				<el-table-column prop="money" min-width="120" align="center"  >
 				  <template #header> <span class="hl-table_header">*</span>金额</template>
 				  <template #default="scope">
@@ -149,11 +149,11 @@
 				  </template>
 				</el-table-column>
 				 <el-table-column prop="onemoney" label="单价" min-width="120" align="center"/>
-				 
-				 
-				 
-				 
-				 
+
+
+
+
+
                   <el-table-column prop="matSub" label="盈亏差异" min-width="120" align="center">
                     <template #default="scope">
                       <div v-if="scope.row.matSub<0" style="color:#EC808D;">
@@ -580,7 +580,8 @@ const handleDeleteAttachment = async (index, type) => {
 // 下载文件
 const downloadAttachment = async (name, url) => {
   if (url) {
-    const data = await downloadFile(url)
+           const baseUrl = import.meta.env.VITE_BASE_URL;
+    url =baseUrl+'/admin-api/'+ url.split('/admin-api/')[1];    const data = await downloadFile(url)
     download.any(data, name)
   }
 }