diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 2788a08..a084cc7 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -14,7 +14,8 @@
 import type { dictType } from '@/global'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -102,7 +103,7 @@
   { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
   { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
-  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -179,7 +180,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -247,13 +248,9 @@
         type: 'warning',
       },
     ).then(() => {
-      const params = {
-        ...listQuery.value,
-        ids: [row.id],
-      }
-      exportCert(params).then((res) => {
-        const blob = new Blob([res.data])
-        exportFile(blob, '证书打印列表.xlsx')
+      getPhotoUrl(row.printFileName as string).then((res) => {
+        const url = res.data
+        download(url, row.printFileName as string)
       })
     })
   }
@@ -385,7 +382,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column v-if="!['可打印', '全部'].includes(activeTitle)" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 2788a08..a084cc7 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -14,7 +14,8 @@
 import type { dictType } from '@/global'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -102,7 +103,7 @@
   { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
   { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
-  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -179,7 +180,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -247,13 +248,9 @@
         type: 'warning',
       },
     ).then(() => {
-      const params = {
-        ...listQuery.value,
-        ids: [row.id],
-      }
-      exportCert(params).then((res) => {
-        const blob = new Blob([res.data])
-        exportFile(blob, '证书打印列表.xlsx')
+      getPhotoUrl(row.printFileName as string).then((res) => {
+        const url = res.data
+        download(url, row.printFileName as string)
       })
     })
   }
@@ -385,7 +382,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column v-if="!['可打印', '全部'].includes(activeTitle)" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
new file mode 100644
index 0000000..e15c8ba
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -0,0 +1,195 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageBySubpackage } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方id
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        :page-sizes="[20]"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <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>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 2788a08..a084cc7 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -14,7 +14,8 @@
 import type { dictType } from '@/global'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -102,7 +103,7 @@
   { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
   { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
-  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -179,7 +180,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -247,13 +248,9 @@
         type: 'warning',
       },
     ).then(() => {
-      const params = {
-        ...listQuery.value,
-        ids: [row.id],
-      }
-      exportCert(params).then((res) => {
-        const blob = new Blob([res.data])
-        exportFile(blob, '证书打印列表.xlsx')
+      getPhotoUrl(row.printFileName as string).then((res) => {
+        const url = res.data
+        download(url, row.printFileName as string)
       })
     })
   }
@@ -385,7 +382,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column v-if="!['可打印', '全部'].includes(activeTitle)" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
new file mode 100644
index 0000000..e15c8ba
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -0,0 +1,195 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageBySubpackage } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方id
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        :page-sizes="[20]"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <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>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 74990a4..542e2aa 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -1,18 +1,22 @@
 <!-- 分包申请详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
 import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/apply'
+import { detail, save, submit } from '@/api/business/subpackage/apply'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
@@ -56,7 +60,7 @@
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
@@ -76,7 +80,7 @@
     // }
     // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +103,161 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.sampleNo,
+        }
+      })
+      const params = {
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: 0,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: '',
+        sampleList: [
+          // {
+          //   customerName: '',
+          //   manufacturingNo: '',
+          //   orderCode: '',
+          //   sampleModel: '',
+          //   sampleName: '',
+          //   sampleNo: '',
+          // },
+          ...list.value,
+        ],
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    customerName: '', // 消费名称
+    manufacturingNo: '', // 编号
+    orderCode: '', // 订单code
+    sampleModel: '', // 样品模型
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+  })
+}
+const sampleVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+const checkoutList = ref([])
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+    if (index !== -1) {
+      ElMessage.warning('此样品已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 选择样品对话框关闭
+const closeDialog = () => {
+  sampleVisible.value = false
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +287,12 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.createUser = window.localStorage.getItem('name')!
+    detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
 })
 </script>
 
@@ -163,10 +328,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -198,16 +363,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applicantName">
+            <el-form-item label="申请人:" prop="createUser">
               <el-input
-                v-model="detailForm.applicantName" disabled
+                v-model="detailForm.createUser" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请时间:" prop="applicantTime">
+            <el-form-item label="申请时间:" prop="createTime">
               <el-input
-                v-model="detailForm.applicantTime" disabled
+                v-model="detailForm.createTime" disabled
               />
             </el-form-item>
           </el-col>
@@ -228,9 +393,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包原因:" prop="outsourceReasonName">
+            <el-form-item label="分包原因:" prop="outsourceReason">
               <el-input
-                v-model="detailForm.outsourceReasonName"
+                v-model="detailForm.outsourceReason"
                 :disabled="query.title === '详情'"
               />
             </el-form-item>
@@ -283,7 +448,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -294,14 +459,27 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
+    <detail-block title="样品列表">
+      <template v-if="query.title !== '详情'" #btns>
+        <!-- <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button> -->
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+
       <el-table
         :data="list"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -311,13 +489,25 @@
           :width="item.width"
           show-overflow-tooltip
           align="center"
-        />
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
+    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   </app-container>
 </template>
 

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 2788a08..a084cc7 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -14,7 +14,8 @@
 import type { dictType } from '@/global'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -102,7 +103,7 @@
   { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
   { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
-  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -179,7 +180,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -247,13 +248,9 @@
         type: 'warning',
       },
     ).then(() => {
-      const params = {
-        ...listQuery.value,
-        ids: [row.id],
-      }
-      exportCert(params).then((res) => {
-        const blob = new Blob([res.data])
-        exportFile(blob, '证书打印列表.xlsx')
+      getPhotoUrl(row.printFileName as string).then((res) => {
+        const url = res.data
+        download(url, row.printFileName as string)
       })
     })
   }
@@ -385,7 +382,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column v-if="!['可打印', '全部'].includes(activeTitle)" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
new file mode 100644
index 0000000..e15c8ba
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -0,0 +1,195 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageBySubpackage } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方id
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        :page-sizes="[20]"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <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>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 74990a4..542e2aa 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -1,18 +1,22 @@
 <!-- 分包申请详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
 import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/apply'
+import { detail, save, submit } from '@/api/business/subpackage/apply'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
@@ -56,7 +60,7 @@
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
@@ -76,7 +80,7 @@
     // }
     // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +103,161 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.sampleNo,
+        }
+      })
+      const params = {
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: 0,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: '',
+        sampleList: [
+          // {
+          //   customerName: '',
+          //   manufacturingNo: '',
+          //   orderCode: '',
+          //   sampleModel: '',
+          //   sampleName: '',
+          //   sampleNo: '',
+          // },
+          ...list.value,
+        ],
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    customerName: '', // 消费名称
+    manufacturingNo: '', // 编号
+    orderCode: '', // 订单code
+    sampleModel: '', // 样品模型
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+  })
+}
+const sampleVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+const checkoutList = ref([])
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+    if (index !== -1) {
+      ElMessage.warning('此样品已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 选择样品对话框关闭
+const closeDialog = () => {
+  sampleVisible.value = false
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +287,12 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.createUser = window.localStorage.getItem('name')!
+    detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
 })
 </script>
 
@@ -163,10 +328,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -198,16 +363,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applicantName">
+            <el-form-item label="申请人:" prop="createUser">
               <el-input
-                v-model="detailForm.applicantName" disabled
+                v-model="detailForm.createUser" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请时间:" prop="applicantTime">
+            <el-form-item label="申请时间:" prop="createTime">
               <el-input
-                v-model="detailForm.applicantTime" disabled
+                v-model="detailForm.createTime" disabled
               />
             </el-form-item>
           </el-col>
@@ -228,9 +393,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包原因:" prop="outsourceReasonName">
+            <el-form-item label="分包原因:" prop="outsourceReason">
               <el-input
-                v-model="detailForm.outsourceReasonName"
+                v-model="detailForm.outsourceReason"
                 :disabled="query.title === '详情'"
               />
             </el-form-item>
@@ -283,7 +448,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -294,14 +459,27 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
+    <detail-block title="样品列表">
+      <template v-if="query.title !== '详情'" #btns>
+        <!-- <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button> -->
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+
       <el-table
         :data="list"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -311,13 +489,25 @@
           :width="item.width"
           show-overflow-tooltip
           align="center"
-        />
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
+    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 9cca21e..57a789a 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -112,6 +112,7 @@
     },
     query: {
       title: '新建',
+      formId: listQuery.value.formId,
     },
   })
 }
@@ -141,6 +142,7 @@
     },
     query: {
       title: '详情',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -156,6 +158,7 @@
     },
     query: {
       title: '编辑',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })

diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts
index 6e2ae82..f7ac81c 100644
--- a/src/api/business/subpackage/apply.ts
+++ b/src/api/business/subpackage/apply.ts
@@ -76,3 +76,12 @@
     data,
   })
 }
+
+export function listPageBySubpackage(data: object) {
+  return request({
+    url: '/customer/sample/listPageBySubpackage',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/index.ts b/src/api/index.ts
index 7591ed2..87d5969 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios'
 // import qs from 'qs'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import router from '@/router/index'
 import useUserStore from '@/store/modules/user'
 // 错误码枚举
@@ -68,7 +68,12 @@
       }
       else {
         // 这里做错误提
-        ElMessage.error(response.data.message || '发生错误')
+        ElMessage.error(`${response.data.message}` || '发生错误')
+        const loadingInstance = ElLoading.service({})
+        nextTick(() => {
+          // Loading should be closed asynchronously
+          loadingInstance.close()
+        })
       }
 
       return Promise.reject(response.data)
diff --git a/src/main.ts b/src/main.ts
index 3cf24ef..3cfb61f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,11 +2,11 @@
 import ElementPlus from 'element-plus'
 import print from 'vue3-print-nb'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
 import App from './App.vue'
 import pinia from './store'
 import router from './router'
 import useSettingsStore from './store/modules/settings'
-
 // 自定义指令
 import directive from '@/utils/directive'
 // 加载 svg 图标
@@ -24,6 +24,7 @@
 const app = createApp(App)
 app.config.globalProperties.hasPerm = hasPermission
 app.config.globalProperties.buttonPerm = buttonPerm
+app.config.globalProperties.dayjs = dayjs
 app.use(print)
 app.use(ElementPlus)
 app.use(pinia)
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index be9379d..b302245 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -46,6 +46,7 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  printFileName?: string // 文件名称
   taskId?: string // 任务id
   id: string // 主键
   reason?: string // 操作原因
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index ffe7412..3479854 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -25,6 +25,10 @@
   printStatus.value = $route.query.printStatus as string
 }
 
+if ($route.query && $route.query.pageType) {
+  pageType.value = $route.query.pageType as string
+}
+
 // 逻辑代码
 const dataForm = ref<ICertification>({
   certificationId: '',
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 2788a08..a084cc7 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -14,7 +14,8 @@
 import type { dictType } from '@/global'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -102,7 +103,7 @@
   { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
   { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
-  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum)]}次打印` } },
+  { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
 // 表格数据
@@ -179,7 +180,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -247,13 +248,9 @@
         type: 'warning',
       },
     ).then(() => {
-      const params = {
-        ...listQuery.value,
-        ids: [row.id],
-      }
-      exportCert(params).then((res) => {
-        const blob = new Blob([res.data])
-        exportFile(blob, '证书打印列表.xlsx')
+      getPhotoUrl(row.printFileName as string).then((res) => {
+        const url = res.data
+        download(url, row.printFileName as string)
       })
     })
   }
@@ -385,7 +382,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column v-if="!['可打印', '全部'].includes(activeTitle)" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
           <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
diff --git a/src/views/business/subpackage/apply/components/selectSample.vue b/src/views/business/subpackage/apply/components/selectSample.vue
new file mode 100644
index 0000000..e15c8ba
--- /dev/null
+++ b/src/views/business/subpackage/apply/components/selectSample.vue
@@ -0,0 +1,195 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleList } from '../../subpackage-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageBySubpackage } from '@/api/business/subpackage/apply'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+  orderId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleList> = ref({
+  id: '',
+  orderCode: '',	// 原始记录单编号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  customerNo: '', // 委托方id
+  customerName: '', // 委托方名称
+  startTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // listQuery.value.customerId = props.customerId
+  // listQuery.value.id = props.orderId
+  listPageBySubpackage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    id: '',
+    orderCode: '',	// 原始记录单编号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    customerNo: '', // 委托方id
+    customerName: '', // 委托方名称
+    startTime: '',
+    endTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        :page-sizes="[20]"
+        :height="260"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <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>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 74990a4..542e2aa 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -1,18 +1,22 @@
 <!-- 分包申请详情 -->
 <script lang="ts" setup>
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
 import { filter } from 'lodash'
-import type { IApplyDetail, IDetailList } from '../subpackage-interface'
+import type { IApplyDetail, ISampleList } from '../subpackage-interface'
+// import selectSampleDialog from './components/selectSampleDialog.vue'
+import selectSample from './components/selectSample.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { detail } from '@/api/business/subpackage/apply'
+import { detail, save, submit } from '@/api/business/subpackage/apply'
 import { fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 
+const { proxy } = getCurrentInstance() as any
 const $route = useRoute()
 const $router = useRouter()
 const query = $route.query
+const ruleFormRef = ref<FormInstance>() as any
 const detailForm = ref<IApplyDetail>({
   applicantName: '', // 申请名称
   applicantId: '', // 申请id
@@ -56,7 +60,7 @@
   preEndTime: [{ required: true, message: '预计结束时间必填', trigger: ['blur', 'change'] }],
 })
 
-const list = ref<IDetailList[]>([])// 表格数据
+const list = ref<ISampleList[]>([])// 表格数据
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '230' },
@@ -76,7 +80,7 @@
     // }
     // console.log(interfaceStr)
     detailForm.value = res.data
-    list.value = res.data.sampleList.filter((item: IDetailList) => {
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
       return item !== null
     })
   })
@@ -99,6 +103,161 @@
 const close = () => {
   $router.back()
 }
+
+// 保存
+const handleSave = () => {
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      const _list = list.value.map((item: any) => {
+        return {
+          orderId: item.orderId ? item.orderId : 0,
+          sampleId: item.sampleNo,
+        }
+      })
+      const params = {
+        applicantTime: detailForm.value.applicantTime,
+        applyMinioFileName: detailForm.value.applyMinioFileName,
+        applyProcessId: detailForm.value.applyProcessId,
+        applyRemark: detailForm.value.applyRemark,
+        outsourceReason: detailForm.value.outsourceReason,
+        outsourceReasonName: detailForm.value.outsourceReasonName,
+        outsourcerId: 0,
+        preCost: detailForm.value.preCost,
+        preEndTime: detailForm.value.preEndTime,
+        preStartTime: detailForm.value.preStartTime,
+        projectName: detailForm.value.projectName,
+        projectNo: '',
+        sampleList: [
+          // {
+          //   customerName: '',
+          //   manufacturingNo: '',
+          //   orderCode: '',
+          //   sampleModel: '',
+          //   sampleName: '',
+          //   sampleNo: '',
+          // },
+          ...list.value,
+        ],
+        orderSampleList: [..._list],
+      }
+      save(params).then((res) => {
+        detailForm.value.id = res.data.id
+        ElMessage.success('保存成功')
+        loading.close()
+        close()
+      })
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (detailForm.value.id) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: detailForm.value.id,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存再提交！')
+  }
+}
+
+// 增加行
+const addRow = () => {
+  const index = list.value.findIndex(item => !item.sampleNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  list.value.push({
+    customerName: '', // 消费名称
+    manufacturingNo: '', // 编号
+    orderCode: '', // 订单code
+    sampleModel: '', // 样品模型
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+  })
+}
+const sampleVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  sampleVisible.value = true
+  isMulti.value = true
+}
+
+const checkoutList = ref([])
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    const index = list.value.findIndex((i: ISampleList) => val[0].sampleNo === i.sampleNo)
+    if (index !== -1) {
+      ElMessage.warning('此样品已添加过')
+      return
+    }
+    list.value.splice(selectIndex.value, 1, val[0])
+  }
+}
+
+// 选中行
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e
+}
+
+// 删除行
+const delRow = () => {
+  if (checkoutList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutList.value.forEach((item: ISampleList) => {
+      list.value.forEach((element, index) => {
+        if (element.sampleNo === item.sampleNo) {
+          list.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 选择样品对话框关闭
+const closeDialog = () => {
+  sampleVisible.value = false
+}
+
 // 文件上传
 const fileRef = ref()
 const onFileChange = (event: any) => {
@@ -128,6 +287,12 @@
   if (query.title !== '新建') {
     getDetail()
   }
+  else {
+    // 初始化编号,申请人,申请时间
+    detailForm.value.projectNo = '系统自动生成'
+    detailForm.value.createUser = window.localStorage.getItem('name')!
+    detailForm.value.createTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
 })
 </script>
 
@@ -163,10 +328,10 @@
           </el-button>
         </template>
         <template v-if="query.title === '新建'">
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSave">
             保存
           </el-button>
-          <el-button type="primary">
+          <el-button type="primary" @click="handleSubmit">
             提交
           </el-button>
         </template>
@@ -198,16 +363,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请人:" prop="applicantName">
+            <el-form-item label="申请人:" prop="createUser">
               <el-input
-                v-model="detailForm.applicantName" disabled
+                v-model="detailForm.createUser" disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="申请时间:" prop="applicantTime">
+            <el-form-item label="申请时间:" prop="createTime">
               <el-input
-                v-model="detailForm.applicantTime" disabled
+                v-model="detailForm.createTime" disabled
               />
             </el-form-item>
           </el-col>
@@ -228,9 +393,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="分包原因:" prop="outsourceReasonName">
+            <el-form-item label="分包原因:" prop="outsourceReason">
               <el-input
-                v-model="detailForm.outsourceReasonName"
+                v-model="detailForm.outsourceReason"
                 :disabled="query.title === '详情'"
               />
             </el-form-item>
@@ -283,7 +448,7 @@
               <input v-show="query.title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <span v-if="query.title === '详情' && !detailForm.applyMinioFileName">无</span>
               <div v-else style="display: flex;">
-                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;margin: 10px;" />
+                <show-photo :minio-file-name="detailForm.applyMinioFileName || ''" style="display: inline-block;" />
               </div>
               <el-button v-if="query.title !== '详情'" type="primary" :disabled="query.title === '详情'" @click="upload">
                 {{ detailForm.applyMinioFileName ? '更换' : '上传' }}
@@ -294,14 +459,27 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="样品详情">
+    <detail-block title="样品列表">
+      <template v-if="query.title !== '详情'" #btns>
+        <!-- <el-button type="primary" @click="multiAdd">
+          批量添加
+        </el-button> -->
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="delRow">
+          删除行
+        </el-button>
+      </template>
+
       <el-table
         :data="list"
         border
         style="width: 100%;"
         max-height="600"
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="query.title !== '详情'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -311,13 +489,25 @@
           :width="item.width"
           show-overflow-tooltip
           align="center"
-        />
+        >
+          <template v-if="item.value === 'sampleNo' && ['新建', '编辑'].includes(query.title as string)" #default="scope">
+            <el-input v-model="scope.row.sampleNo" placeholder="请选择设备" class="input">
+              <template #append>
+                <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新增'" title="审批流程">
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && query.title !== '新建'" title="审批流程">
       <!-- 审批流程 -->
       <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
+    <!-- :order-id="detailForm.orderId" :customer-id="formInline.customerId" -->
+    <select-sample v-model:visible="sampleVisible" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
   </app-container>
 </template>
 
diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue
index 9cca21e..57a789a 100644
--- a/src/views/business/subpackage/apply/list.vue
+++ b/src/views/business/subpackage/apply/list.vue
@@ -112,6 +112,7 @@
     },
     query: {
       title: '新建',
+      formId: listQuery.value.formId,
     },
   })
 }
@@ -141,6 +142,7 @@
     },
     query: {
       title: '详情',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
@@ -156,6 +158,7 @@
     },
     query: {
       title: '编辑',
+      formId: listQuery.value.formId,
       approvalStatusName: menu.value.find(item => item.id === active.value)!.name as string,
     },
   })
diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts
index 9fbbb49..23962d2 100644
--- a/src/views/business/subpackage/subpackage-interface.ts
+++ b/src/views/business/subpackage/subpackage-interface.ts
@@ -53,7 +53,7 @@
   checkerName: string // 检查名称
   createTime: string // 创建时间
   createUser: string // 创建人
-  id: string
+  id?: string | number
   orderSampleList: string // 订单列表
   outsourceReason: string // 原因
   outsourceReasonName: string // 原因名称
@@ -69,13 +69,19 @@
 }
 
 // 申请列表详情列表参数
-export interface IDetailList {
-  customerName: string
-  manufacturingNo: string
-  orderCode: string
-  sampleModel: string
-  sampleName: string
-  sampleNo: string
+export interface ISampleList {
+  id?: string | number
+  offset?: string | number
+  limit?: string | number
+  customerName: string // 委托方名称
+  customerNo: string 	// 委托方代码
+  manufacturingNo: string // 编号
+  orderCode: string // 订单code
+  sampleModel: string // 样品模型
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  startTime: string // 开始时间
+  endTime: string // 结束时间
 }
 
 // 分包方审批查询参数