diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index d7cce93..8426bb1 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -507,11 +507,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
-  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
-  if (index !== -1) {
-    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
-    return false
-  }
+  // const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  // if (index !== -1) {
+  //   ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+  //   return false
+  // }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -750,7 +750,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index d7cce93..8426bb1 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -507,11 +507,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
-  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
-  if (index !== -1) {
-    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
-    return false
-  }
+  // const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  // if (index !== -1) {
+  //   ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+  //   return false
+  // }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -750,7 +750,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 730ac4b..04f5e20 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -377,7 +377,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   getStream({ id: infoId.value }).then((res) => {
-    exportFile(res.data, '样品交接单.xls')
+    exportFile(res.data, '样品交接单.xlsx')
     loading.close()
   })
 }

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index d7cce93..8426bb1 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -507,11 +507,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
-  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
-  if (index !== -1) {
-    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
-    return false
-  }
+  // const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  // if (index !== -1) {
+  //   ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+  //   return false
+  // }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -750,7 +750,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 730ac4b..04f5e20 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -377,7 +377,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   getStream({ id: infoId.value }).then((res) => {
-    exportFile(res.data, '样品交接单.xls')
+    exportFile(res.data, '样品交接单.xlsx')
     loading.close()
   })
 }
diff --git a/src/views/business/schedule/order/components/selectCustomer.vue b/src/views/business/schedule/order/components/selectCustomer.vue
index 7598e7f..5bd48cd 100644
--- a/src/views/business/schedule/order/components/selectCustomer.vue
+++ b/src/views/business/schedule/order/components/selectCustomer.vue
@@ -200,13 +200,13 @@
       @multiSelect="handleSelectionChange"
     >
       <!-- 序号 -->
-      <!-- <template #preColumns>
+      <template #preColumns>
         <el-table-column label="#" width="55" align="center" fixed>
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column>
-      </template> -->
+      </template>
     </normal-table>
     <template #footer>
       <el-button type="primary" @click="clickConfirm">

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index d7cce93..8426bb1 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -507,11 +507,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
-  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
-  if (index !== -1) {
-    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
-    return false
-  }
+  // const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  // if (index !== -1) {
+  //   ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+  //   return false
+  // }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -750,7 +750,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 730ac4b..04f5e20 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -377,7 +377,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   getStream({ id: infoId.value }).then((res) => {
-    exportFile(res.data, '样品交接单.xls')
+    exportFile(res.data, '样品交接单.xlsx')
     loading.close()
   })
 }
diff --git a/src/views/business/schedule/order/components/selectCustomer.vue b/src/views/business/schedule/order/components/selectCustomer.vue
index 7598e7f..5bd48cd 100644
--- a/src/views/business/schedule/order/components/selectCustomer.vue
+++ b/src/views/business/schedule/order/components/selectCustomer.vue
@@ -200,13 +200,13 @@
       @multiSelect="handleSelectionChange"
     >
       <!-- 序号 -->
-      <!-- <template #preColumns>
+      <template #preColumns>
         <el-table-column label="#" width="55" align="center" fixed>
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column>
-      </template> -->
+      </template>
     </normal-table>
     <template #footer>
       <el-button type="primary" @click="clickConfirm">
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index b3bdb08..f59a1e2 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -369,6 +369,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success('文件上传成功')
         loading.close()
@@ -796,6 +797,16 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="附件:">
+                  <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                  <span v-else-if="pageType === 'detail'">无</span>
+                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="8">
                 <el-form-item label="送样人:" prop="deliverer">
                   <el-input
@@ -1091,9 +1102,9 @@
       </div> -->
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
     <!-- 选择计量人员组件列表 -->
     <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />

diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index b9c1fa9..7cd0aaf 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -192,3 +192,20 @@
     data,
   })
 }
+// 退检
+export function sendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure',
+    method: 'post',
+    data,
+  })
+}
+
+// 确定退检
+export function confirmSendBack(data: object) {
+  return request({
+    url: '/business/labExecutive/executive/noMeasure/confirm',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/excelEdit/index.vue b/src/components/excelEdit/index.vue
index bdb9ca3..2996951 100644
--- a/src/components/excelEdit/index.vue
+++ b/src/components/excelEdit/index.vue
@@ -2,61 +2,65 @@
 <script setup lang="ts" name="ExcelEditDialog">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
-import * as GC from '@grapecity-software/spread-sheets'
-import '@grapecity-software/spread-sheets-print'
+import GC from '@grapecity-software/spread-sheets'
 import '@grapecity-software/spread-sheets-shapes'
+import '@grapecity-software/spread-sheets-charts'
 import '@grapecity-software/spread-sheets-slicers'
+import '@grapecity-software/spread-sheets-print'
+import '@grapecity-software/spread-sheets-barcode'
+import '@grapecity-software/spread-sheets-pdf'
 import '@grapecity-software/spread-sheets-pivot-addon'
 import '@grapecity-software/spread-sheets-tablesheet'
 import '@grapecity-software/spread-sheets-ganttsheet'
-import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-formula-panel'
+import '@grapecity-software/spread-sheets-reportsheet-addon'
 import '@grapecity-software/spread-sheets-io'
+import '@grapecity-software/spread-excelio'
 import '@grapecity-software/spread-sheets-resources-zh'
+// 注意：spread-sheets-designer-resources-cn 与 spread-sheets-designer 的先后顺序
 import '@grapecity-software/spread-sheets-designer-resources-cn'
 import '@grapecity-software/spread-sheets-designer'
-import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 import { importFile } from './index'
 const emits = defineEmits(['initComplete'])
 GC.Spread.Common.CultureManager.culture('zh-cn')
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-
+// const config = GC.Spread.Sheets.Designer.DefaultConfig
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 // ----------------------------------------初始化相关-----------------------------------------------
-// 左上角按钮事件
-config.commandMap = {
-  Welcome: {
-    title: '执行表格绑定',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      handleBindForm()
-    },
-  },
-}
-// 左上角按钮配置
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-    //   // This is custom button ----------------end-------------
-    ],
-  },
-})
+// // 左上角按钮事件
+// config.commandMap = {
+//   Welcome: {
+//     title: '执行表格绑定',
+//     text: 'Welcome',
+//     iconClass: 'ribbon-button-welcome',
+//     bigButton: 'true',
+//     commandName: 'Welcome',
+//     execute: async (context, propertyName, fontItalicChecked) => {
+//       handleBindForm()
+//     },
+//   },
+// }
+// // 左上角按钮配置
+// config.ribbon[0].buttonGroups.unshift({
+//   label: 'NewDesigner',
+//   thumbnailClass: 'welcome',
+//   commandGroup: {
+//     children: [
+//       {
+//         direction: 'vertical',
+//         commands: ['Welcome'],
+//       },
+//     //   // This is custom button ----------------end-------------
+//     ],
+//   },
+// })
 
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 1, // 表格初始化的时候有几个sheet页
-}
-const designer: any = ref(null)
-const spread: any = ref(null)
-const sheet: any = ref(null)
+// const styleInfo = { height: '86vh', width: '100%' }
+// const spreadOptions = {
+//   sheetCount: 1, // 表格初始化的时候有几个sheet页
+// }
 
 // designer初始化完成
 const designerInitialized = async (value: any) => {
@@ -121,40 +125,51 @@
 // 初始化弹窗
 const initDialog = (id: string, sampleid: string, orderid: string) => {
   dialogVisible.value = true
+  nextTick(() => {
+    designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+    spread = designer.getWorkbook()
+    sheet = spread.getActiveSheet()
+    designerInitialized1()
+  })
 }
 const closeDialog = () => {
   dialogVisible.value = false
 }
+// designer初始化完成
+async function designerInitialized1() {
+  const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
+  const file = await res.blob()
+  spread.import(
+    file,
+    () => {
+      console.log('spread：导入文件成功')
+    },
+    (e) => {
+      console.log('spread：上传文件发生错误', e)
+    },
+    {
+      fileType: GC.Spread.Sheets.FileType.excel,
+    },
+  )
+}
 // -------------------------------------------------------------------------------------------
 defineExpose({ initDialog, handleImportFile })
 </script>
 
 <template>
   <el-dialog v-model="dialogVisible" v-loding="loading" :z-index="1200" append-to-body class="excel-edit-dialog" :fullscreen="true" title="excel在线编辑" width="700" @close="closeDialog">
-    <div id="gc-designer-container">
-      <my-designer
-        :style-info="styleInfo"
-        :config="config"
-        :spread-options="spreadOptions"
-        @designer-initialized="designerInitialized"
-      />
-    </div>
-    <template #footer>
+    <div id="designer-container" ref="designerContainerRef" />
+    <!-- <template #footer>
       <el-button type="info" @click="closeDialog">
         关闭
       </el-button>
-    </template>
+    </template> -->
   </el-dialog>
 </template>
 
 <style lang="scss">
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
-}
-
-.ribbon-button-welcome {
-  background-image: url("./assets/welcome.png");
-  background-size: 35px 35px;
+  height: 91vh;
 }
 </style>
diff --git a/src/utils/download.ts b/src/utils/download.ts
index e7ffdb4..0851294 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -119,7 +119,7 @@
   // 下载图片
   const photo = ['jpg', 'jpeg', 'png']
   const fileType = url.split('.')[url.split('.').length - 1]
-  console.log(fileType, 'fileType')
+  console.log(fileType, 'fileType文件类型')
   if (photo.includes(fileType)) {
     // 图片 将服务器图片地址转化成本地地址
     const image = new Image()
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index 9581187..e792799 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -140,7 +140,8 @@
       background: 'rgba(255, 255, 255, 0.6)',
     })
     getPhotoUrl(row.printFileName).then((res) => {
-      download(res.data, `${row.certificateName}.xlsx` as string)
+      const fileType = res.data.split('.')[res.data.split('.').length - 1]
+      download(res.data, `${row.certificateName}.${fileType}` as string)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
diff --git a/src/views/business/lab/components/sendBackDialog.vue b/src/views/business/lab/components/sendBackDialog.vue
new file mode 100644
index 0000000..d2f506a
--- /dev/null
+++ b/src/views/business/lab/components/sendBackDialog.vue
@@ -0,0 +1,152 @@
+<!-- 退检操作 -->
+<script lang="ts" setup name="SendBackDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface'
+import { confirmSendBack, sendBack } from '@/api/business/schedule/task'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 表单数据对象
+const formData = reactive({
+  id: '',
+  operateReason: '', // 退回原因
+  measurePersonId: '',
+  orderId: '',
+  requireCertifications: '',
+  sampleId: '',
+})
+const type = ref('sendBack') // sendBack退检、confirmSendBack 确认退检
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  operateReason: [{ required: true, message: '退检原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(row: IlabMeasureList, typeParam = 'sendBack') {
+  type.value = typeParam
+  formData.id = row.id
+  formData.operateReason = ''
+  if (typeParam === 'confirmSendBack') {
+    formData.measurePersonId = row.measurePersonId
+    formData.orderId = row.orderId
+    formData.requireCertifications = `${row.requireCertifications}`
+    formData.sampleId = row.sampleId
+    formData.operateReason = row.remark
+  }
+  else {
+    formData.operateReason = ''
+  }
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef.value) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认退检吗？',
+          '提示',
+          { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+        ).then(() => {
+          btnLoading.value = true
+          if (type.value === 'sendBack') {
+            const params = {
+              id: formData.id,
+              operateReason: formData.operateReason, // 退回原因
+            }
+            sendBack(params).then((res: { code: number }) => {
+              if (res.code == 200) {
+                ElMessage.success('退检成功')
+                btnLoading.value = false
+                dialogVisible.value = false
+                emit('onSuccess')
+              }
+            }).catch((_) => {
+              btnLoading.value = false
+            })
+          }
+          else {
+            const params = [{
+              measurePersonId: formData.measurePersonId,
+              orderId: formData.orderId,
+              requireCertifications: formData.requireCertifications,
+              sampleId: formData.sampleId,
+            }]
+            confirmSendBack(params).then(() => {
+              ElMessage.success('确认退检成功')
+              btnLoading.value = false
+              dialogVisible.value = false
+              emit('onSuccess')
+            })
+          }
+        })
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="type === 'confirmSendBack' ? '确认退检' : '退检'"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item :label="type === 'confirmSendBack' ? '退检原因' : '请输入退检原因'" prop="operateReason">
+            <el-input
+              v-model="formData.operateReason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+              :maxlength="50"
+              :disabled="type === 'confirmSendBack'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 315e6a9..ada484b 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -6,6 +6,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import batchDistributeDialog from '@/views/business/schedule/task/components/batchDistributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -77,19 +78,6 @@
           })
         }
       })
-      // menu.value = menu.value.map(item => {
-      //   if(item.name === '待检测') {
-      //     return {
-      //       ...item,
-      //       name: '待分配',
-      //       id: '1'
-      //     }
-      //   } else {
-      //     return item
-      //   }
-      // })
-      console.log('-------', menu.value)
-
       resolve(menu.value)
     })
   })
@@ -110,6 +98,7 @@
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
+  { text: '备注', value: 'remark', align: 'center' },
 ])
 // 表格数据
 const list = ref<ITaskList[]>([])
@@ -256,6 +245,12 @@
   rollbackRef.value.initDialog(row)
 }
 
+// 确定退检
+const sendBackRef = ref()
+const confirmSendBack = (row: any) => {
+  sendBackRef.value.initDialog(row, 'confirmSendBack')
+}
+
 // 捡完
 const mearsureOver = function (row: ITaskList) {
   let param = [] as any
@@ -360,7 +355,7 @@
 <template>
   <app-container>
     <!-- 三级菜单 -->
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -449,7 +444,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="145">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -460,10 +455,15 @@
               <el-button v-if="listQuery.measureStatus !== '4'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2' && row.measureStatus === '7'" size="small" type="primary" link @click="confirmSendBack(row)">
+                确定退检
+              </el-button>
             </template>
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 任务分发弹窗 -->
diff --git a/src/views/business/lab/excelEdit/index.vue b/src/views/business/lab/excelEdit/index.vue
index 6e7e28c..c5b8557 100644
--- a/src/views/business/lab/excelEdit/index.vue
+++ b/src/views/business/lab/excelEdit/index.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import '@grapecity-software/spread-sheets/styles/gc.spread.sheets.excel2013white.css'
 import '@grapecity-software/spread-sheets-designer/styles/gc.spread.sheets.designer.min.css'
 import GC from '@grapecity-software/spread-sheets'
@@ -22,49 +22,16 @@
 import MyDesigner from '@grapecity-software/spread-sheets-designer-vue'
 
 GC.Spread.Common.CultureManager.culture('zh-cn')
+let designer: any = null
+let spread: any = null
+let sheet: any = null
+const designerContainerRef = ref(null) // 引用Designer的宿主Dom元素
 
-const config = GC.Spread.Sheets.Designer.DefaultConfig
-config.commandMap = {
-  Welcome: {
-    title: 'Welcome',
-    text: 'Welcome',
-    iconClass: 'ribbon-button-welcome',
-    bigButton: 'true',
-    commandName: 'Welcome',
-    execute: async (context, propertyName, fontItalicChecked) => {
-      alert('Welcome to new designer.')
-    },
-  },
-}
-config.ribbon[0].buttonGroups.unshift({
-  label: 'NewDesigner',
-  thumbnailClass: 'welcome',
-  commandGroup: {
-    children: [
-      {
-        direction: 'vertical',
-        commands: ['Welcome'],
-      },
-      // This is custom button ----------------end-------------
-    ],
-  },
-})
-
-const styleInfo = { height: '86vh', width: '100%' }
-const spreadOptions = {
-  sheetCount: 2,
-}
-const designer = ref(null)
-const spread = ref(null)
-const sheet = ref(null)
 // designer初始化完成
 const designerInitialized = async (value) => {
-  designer.value = value
-  spread.value = designer.value.getWorkbook() // 获取设计器的工作簿
-  sheet.value = spread.value.getActiveSheet() // 获取当前表单
   const res = await fetch('http://111.198.10.15:21408/test/压力表-新_1741080567308.xlsx')
   const file = await res.blob()
-  spread.value.import(
+  spread.import(
     file,
     () => {
       console.log('spread：导入文件成功')
@@ -77,23 +44,23 @@
     },
   )
 }
+
+onMounted(() => {
+  designer = new GC.Spread.Sheets.Designer.Designer(designerContainerRef.value)
+  spread = designer.getWorkbook()
+  sheet = spread.getActiveSheet()
+  designerInitialized()
+})
 </script>
 
 <template>
-  <div id="gc-designer-container">
-    <my-designer
-      :style-info="styleInfo"
-      :config="config"
-      :spread-options="spreadOptions"
-      @designer-initialized="designerInitialized"
-    />
-  </div>
+  <div id="designer-container" ref="designerContainerRef" />
 </template>
 
 <style>
-#gc-designer-container {
+#designer-container {
   width: 100%;
-  height: 100%;
+  height: 86vh;
 }
 
 .ribbon-button-welcome {
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index fcb3341..c914b81 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -529,7 +529,10 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       downLoadTemplate(params).then((res) => {
-        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}.xlsx`)
+        const contentDisposition = res.headers.get('Content-Disposition')
+        const match = contentDisposition.match(/\.([^.]+)$/)
+        const fileType = `.${match[1]}`
+        exportFile(res.data, `${form.value.certificateReportName}${form.value.templateName}${fileType}`)
         loading.close()
       }).catch(() => {
         loading.close()
@@ -905,9 +908,9 @@
   <app-container class="business-lab-measure-data-edit">
     <detail-page :title="`计量数据管理-${textMap[pageType]}`">
       <template #btns>
-        <!-- <el-button type="warning" @click="handleClickExcelEdit">
+        <el-button v-if="proxy.hasPerm(`/lab/excelEditBtn`)" type="warning" @click="handleClickExcelEdit">
           excel在线编辑
-        </el-button> -->
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
           上传证书
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 0faf5d4..622cdd5 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -6,6 +6,7 @@
 import { Watch } from '@element-plus/icons-vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
 import addDeviceCom from './components/addDevice.vue'
+import sendBackDialog from './../components/sendBackDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -100,6 +101,7 @@
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   // { text: '证书出具', value: 'certificationState', align: 'center', filter: (row: ITaskList) => { return `${row.currentCertifications}/${row.requireCertifications}` } },
 ])
 // 表格数据
@@ -261,6 +263,11 @@
 const rollback = function (row: ITaskList) {
   rollbackRef.value.initDialog(row)
 }
+// 退检
+const sendBackRef = ref()
+const sendBack = function (row: ITaskList) {
+  sendBackRef.value.initDialog(row)
+}
 
 /**
  * 检完
@@ -405,6 +412,8 @@
     ElMessage.success('添加成功')
   })
 }
+
+// 点击推退检
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -534,13 +543,13 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
+          <!-- <el-table-column v-if="listQuery.measureStatus === '4' || listQuery.measureStatus === '3'" label="备注" align="center">
             <template #default="{ row }">
               {{
                 row.remark
               }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
@@ -552,6 +561,9 @@
               <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="rollback(row)">
                 退回
               </el-button>
+              <el-button v-if="listQuery.measureStatus === '2'" size="small" type="primary" link @click="sendBack(row)">
+                退检
+              </el-button>
               <!-- <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="createPrimitiveLog(row)">
                 {{ row.sampleFileStatus === '1' ? '生成原始记录' : row.sampleFileStatus === '4' ? '查看原始记录' : '编辑原始记录' }}
               </el-button> -->
@@ -565,6 +577,8 @@
           </el-table-column>
         </template>
       </normal-table>
+      <!-- 退检弹窗 -->
+      <send-back-dialog ref="sendBackRef" @on-success="fetchData(true)" />
       <!-- 退回弹窗 -->
       <rollback-dialog ref="rollbackRef" @on-success="fetchData(true)" />
       <!-- 批量收入弹窗 -->
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index d7cce93..8426bb1 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -507,11 +507,11 @@
 }
 // 点击批量检完
 const batchFinish = () => {
-  const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
-  if (index !== -1) {
-    ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
-    return false
-  }
+  // const index = checkoutList.value.findIndex((item: any) => item.sampleStatus === '4')
+  // if (index !== -1) {
+  //   ElMessage.warning(`编号为【${checkoutList.value[index].sampleNo}】的样品【${checkoutList.value[index].sampleName}】已经检完，请取消选中`)
+  //   return false
+  // }
   if (!checkoutList.value.length) {
     ElMessage.warning('请选中')
     return false
@@ -750,7 +750,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入' && row.sampleStatus !== '4'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 730ac4b..04f5e20 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -377,7 +377,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   getStream({ id: infoId.value }).then((res) => {
-    exportFile(res.data, '样品交接单.xls')
+    exportFile(res.data, '样品交接单.xlsx')
     loading.close()
   })
 }
diff --git a/src/views/business/schedule/order/components/selectCustomer.vue b/src/views/business/schedule/order/components/selectCustomer.vue
index 7598e7f..5bd48cd 100644
--- a/src/views/business/schedule/order/components/selectCustomer.vue
+++ b/src/views/business/schedule/order/components/selectCustomer.vue
@@ -200,13 +200,13 @@
       @multiSelect="handleSelectionChange"
     >
       <!-- 序号 -->
-      <!-- <template #preColumns>
+      <template #preColumns>
         <el-table-column label="#" width="55" align="center" fixed>
           <template #default="scope">
             {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
           </template>
         </el-table-column>
-      </template> -->
+      </template>
     </normal-table>
     <template #footer>
       <el-button type="primary" @click="clickConfirm">
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index b3bdb08..f59a1e2 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -369,6 +369,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         dataForm.value.minioFileName = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success('文件上传成功')
         loading.close()
@@ -796,6 +797,16 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="附件:">
+                  <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                  <span v-else-if="pageType === 'detail'">无</span>
+                  <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                    {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="8">
                 <el-form-item label="送样人:" prop="deliverer">
                   <el-input
@@ -1091,9 +1102,9 @@
       </div> -->
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" :customer-id="dataForm.customerId" :order-id="infoId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="扫描添加样品" @confirm="scanOver" />
     <!-- 选择计量人员组件列表 -->
     <select-staff-list ref="merterPersonRef" :is-multi-merter-person="false" @add="confirmSelectPerson" />
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b600a20..16b24db 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -93,6 +93,22 @@
   })
 }
 // 表头
+const toTaskColumns = ref<TableColumn[]>([
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160' },
+  { text: '分发性质', value: 'handOutProperty', width: '100', align: 'center' },
+  { text: '委托方名称', value: 'customerName', width: '120', align: 'center' },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
+  { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
+  { text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
+  { text: '证书出具', value: 'certificationState', align: 'center', width: '90' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+])
+// 表头
 const columns = ref<TableColumn[]>([
   // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
@@ -401,7 +417,7 @@
       </template>
       <normal-table
         ref="tableRef"
-        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
+        :data="list" :total="total" :columns="listQuery.sampleStatus === '2' ? toTaskColumns : columns" :query="listQuery" :list-loading="loadingTable"
         is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
@@ -412,12 +428,6 @@
           </el-table-column>
         </template>
         <template #columns>
-          <!-- 只有待分发存在分发性质 -->
-          <el-table-column v-if="listQuery.sampleStatus === '2'" label="分发性质" align="center" width="100">
-            <template #default="{ row }">
-              {{ row.handOutProperty }}
-            </template>
-          </el-table-column>
           <el-table-column label="操作" align="center" fixed="right" width="180">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">