diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 83a076e..37ea804 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -169,7 +169,6 @@
   console.log(searchQuerySignature.signType)
   console.log(searchQueryAutograph.signType)
 }
-
 // 获取签章数据
 const getSignatureList = () => {
   listPageApi(searchQuerySignature).then((res) => {
@@ -183,8 +182,14 @@
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
-      minioFileNameAutograph.value = res.data.rows[0].minioFileName
-      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
     }
   })
 }
@@ -207,7 +212,7 @@
 // 点击提交
 const submit = () => {}
 
-// ------------------------委托书-----------------------------
+// ----------------------------委托书----------------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -406,6 +411,8 @@
     }
     getSignatureList() // 获取签章数据
     fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
   })
 })
 </script>
@@ -767,17 +774,14 @@
           <span class="title">乙方</span>
 
           <div class="deliverer-time">
-            <div class="img">
-              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            <div style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
-            <div class="img-name">
-              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
-            </div>
-
-            <span class="text-title">接收人:</span>
             <div style="margin-top: 30px;">
               <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
               <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
             </div>
           </div>
         </div>

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 83a076e..37ea804 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -169,7 +169,6 @@
   console.log(searchQuerySignature.signType)
   console.log(searchQueryAutograph.signType)
 }
-
 // 获取签章数据
 const getSignatureList = () => {
   listPageApi(searchQuerySignature).then((res) => {
@@ -183,8 +182,14 @@
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
-      minioFileNameAutograph.value = res.data.rows[0].minioFileName
-      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
     }
   })
 }
@@ -207,7 +212,7 @@
 // 点击提交
 const submit = () => {}
 
-// ------------------------委托书-----------------------------
+// ----------------------------委托书----------------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -406,6 +411,8 @@
     }
     getSignatureList() // 获取签章数据
     fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
   })
 })
 </script>
@@ -767,17 +774,14 @@
           <span class="title">乙方</span>
 
           <div class="deliverer-time">
-            <div class="img">
-              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            <div style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
-            <div class="img-name">
-              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
-            </div>
-
-            <span class="text-title">接收人:</span>
             <div style="margin-top: 30px;">
               <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
               <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
             </div>
           </div>
         </div>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 317bd1d..05a829c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -359,7 +359,7 @@
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                v-if="proxy.hasPerm('/schedule/orderList/edit') && (row.statusName === '未接收' || row.statusName === '已接收')"
                 size="small"
                 type="primary"
                 link
@@ -377,7 +377,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                v-if="proxy.hasPerm('/schedule/orderList/receive') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
@@ -387,7 +387,7 @@
                 接收
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                v-if="proxy.hasPerm('/schedule/orderList/back') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 83a076e..37ea804 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -169,7 +169,6 @@
   console.log(searchQuerySignature.signType)
   console.log(searchQueryAutograph.signType)
 }
-
 // 获取签章数据
 const getSignatureList = () => {
   listPageApi(searchQuerySignature).then((res) => {
@@ -183,8 +182,14 @@
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
-      minioFileNameAutograph.value = res.data.rows[0].minioFileName
-      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
     }
   })
 }
@@ -207,7 +212,7 @@
 // 点击提交
 const submit = () => {}
 
-// ------------------------委托书-----------------------------
+// ----------------------------委托书----------------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -406,6 +411,8 @@
     }
     getSignatureList() // 获取签章数据
     fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
   })
 })
 </script>
@@ -767,17 +774,14 @@
           <span class="title">乙方</span>
 
           <div class="deliverer-time">
-            <div class="img">
-              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            <div style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
-            <div class="img-name">
-              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
-            </div>
-
-            <span class="text-title">接收人:</span>
             <div style="margin-top: 30px;">
               <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
               <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
             </div>
           </div>
         </div>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 317bd1d..05a829c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -359,7 +359,7 @@
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                v-if="proxy.hasPerm('/schedule/orderList/edit') && (row.statusName === '未接收' || row.statusName === '已接收')"
                 size="small"
                 type="primary"
                 link
@@ -377,7 +377,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                v-if="proxy.hasPerm('/schedule/orderList/receive') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
@@ -387,7 +387,7 @@
                 接收
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                v-if="proxy.hasPerm('/schedule/orderList/back') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index e045051..e12d03b 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -27,11 +27,6 @@
 })
 const printStatusList = [
   {
-    name: '全部',
-    value: '',
-
-  },
-  {
     name: '未打印',
     value: '0',
 
@@ -228,6 +223,7 @@
             v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
+            clearable
           >
             <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 83a076e..37ea804 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -169,7 +169,6 @@
   console.log(searchQuerySignature.signType)
   console.log(searchQueryAutograph.signType)
 }
-
 // 获取签章数据
 const getSignatureList = () => {
   listPageApi(searchQuerySignature).then((res) => {
@@ -183,8 +182,14 @@
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
-      minioFileNameAutograph.value = res.data.rows[0].minioFileName
-      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
     }
   })
 }
@@ -207,7 +212,7 @@
 // 点击提交
 const submit = () => {}
 
-// ------------------------委托书-----------------------------
+// ----------------------------委托书----------------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -406,6 +411,8 @@
     }
     getSignatureList() // 获取签章数据
     fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
   })
 })
 </script>
@@ -767,17 +774,14 @@
           <span class="title">乙方</span>
 
           <div class="deliverer-time">
-            <div class="img">
-              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            <div style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
-            <div class="img-name">
-              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
-            </div>
-
-            <span class="text-title">接收人:</span>
             <div style="margin-top: 30px;">
               <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
               <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
             </div>
           </div>
         </div>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 317bd1d..05a829c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -359,7 +359,7 @@
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                v-if="proxy.hasPerm('/schedule/orderList/edit') && (row.statusName === '未接收' || row.statusName === '已接收')"
                 size="small"
                 type="primary"
                 link
@@ -377,7 +377,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                v-if="proxy.hasPerm('/schedule/orderList/receive') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
@@ -387,7 +387,7 @@
                 接收
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                v-if="proxy.hasPerm('/schedule/orderList/back') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index e045051..e12d03b 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -27,11 +27,6 @@
 })
 const printStatusList = [
   {
-    name: '全部',
-    value: '',
-
-  },
-  {
     name: '未打印',
     value: '0',
 
@@ -228,6 +223,7 @@
             v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
+            clearable
           >
             <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/device/bench/deviceBench.vue b/src/views/device/bench/deviceBench.vue
index 25103f4..e946737 100644
--- a/src/views/device/bench/deviceBench.vue
+++ b/src/views/device/bench/deviceBench.vue
@@ -24,7 +24,7 @@
 // 设备台账检定提醒表头
 const standingBookTableHead = [
   { text: '设备名称', value: 'equipmentName' },
-  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '使用人', value: 'usePersonName', width: '120' },
   { text: '上次检定时间', value: 'mesureDate', width: '180' },
 ]
 
@@ -48,8 +48,8 @@
 // 标准装置到期提醒表头
 const standardTableHead = [
   { text: '标准名称', value: 'standardName', align: 'center' },
-  { text: '负责人', value: 'standardOwnerName', align: 'center' },
-  { text: '有效日期', value: 'preparationDate', width: '180', align: 'center' },
+  { text: '负责人', value: 'laboratoryOwnerName', align: 'center' },
+  { text: '有效日期', value: 'validTime', width: '180', align: 'center' },
 ]
 const total = ref(20)
 

diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 5dd199d..22f677b 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -165,7 +169,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="$props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index c400dfd..1b612ef 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -13,6 +13,10 @@
     type: Boolean,
     default: false,
   },
+  isMulti: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 
@@ -175,7 +179,7 @@
         :query="searchQuery"
         :list-loading="loadingTable"
         is-showmulti-select
-        :is-multi="false"
+        :is-multi="props.isMulti"
         :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
index 9bf405a..5c59693 100644
--- a/src/views/business/lab/components/selectReportTemplate.vue
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -74,7 +74,7 @@
   searchQuery.createEndTime = ''
   searchQuery.limit = 5
   searchQuery.offset = 1
-  searchQuery.templateType = ''
+  // searchQuery.templateType = '' // 类型不能变
   searchQuery.ids = []
   getList()
 }
@@ -93,7 +93,6 @@
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  clearList()
 }
 
 // 多选选中
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 859cf92..9fb36c8 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -253,16 +253,18 @@
   }
 })
 onMounted(async () => {
-  await getDict()
   if (window.sessionStorage.getItem('deptMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('deptMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string// 待分发
   }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
+  getDict().then(() => {
+    fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true) // 获取表格数据
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index e5d3c56..621618b 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -284,16 +284,19 @@
 })
 
 onMounted(async () => {
-  await getDict()
+  // await getDict()
   if (window.sessionStorage.getItem('myMeasureActive') != null) {
     active.value = window.sessionStorage.getItem('myMeasureActive') as string
   }
   else {
     active.value = menu.value.find(item => item.name === '待检测')!.id as string // 待检测
   }
-  nextTick(() => {
+  getDict().then(() => {
     fetchData(true)
   })
+  // nextTick(() => {
+  // fetchData(true)
+  // })
 })
 </script>
 
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index a43308c..86babea 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -365,6 +365,12 @@
 }
 
 // ----------------------------------------所用设备-------------------------------------
+const isMultiMeasureDevice = ref(false)
+// 点击批量增加
+const multiAddMeasureDevice = () => {
+  isMultiMeasureDevice.value = true // 是否多选
+  measureDeviceVisible.value = true
+}
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
   if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
@@ -411,6 +417,7 @@
 const handleClickMeasureDevice = (index: number) => {
   measureDeviceVisible.value = true
   selectIndex.value = index
+  isMultiMeasureDevice.value = false
 }
 // 修改测量设备对话框显隐
 const changeMeasureDeviceVisible = (val: boolean) => {
@@ -419,20 +426,34 @@
 // 选好测量设备
 const confirmCheckoutMeasureDevice = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
+    if (isMultiMeasureDevice.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => item.equipmentNo === i.equipmentNo)
+        if (index === -1) {
+          formInline.value.equipmentInfoList.push(item)
+        }
+      })
     }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    else { // 增加行
+      const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+      if (index !== -1) {
+        ElMessage.warning('此设备已添加过')
+        return
+      }
+      formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
+    }
   }
 }
 
 // ------------------------------------------技术文件----------------------------------
+const isMultiFiles = ref(false)
+// 点击批量增加
+const multiAddFiles = () => {
+  isMultiFiles.value = true
+  filesVisible.value = true
+}
 // 点击技术文件增加行
 const addFilesRow = () => {
-  console.log(formInline.value.fileList)
-
   const index = formInline.value.fileList.findIndex((item: fileListType) =>
     !item.fileNo && !item.fileName)
   if (index !== -1) {
@@ -473,20 +494,31 @@
 const handleClickFiles = (index: number) => {
   filesVisible.value = true
   selectFliesIndex.value = index
+  isMultiFiles.value = false
 }
 // 修改技术文件对话框显隐
 const changeFilesVisible = (val: boolean) => {
   filesVisible.value = val
 }
-// 选好测量设备
+// 选好文件
 const confirmCheckoutFiles = (val: any) => {
   if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
+    if (isMultiFiles.value) { // 批量增加
+      val.forEach((item: any) => {
+        const index = formInline.value.fileList.findIndex((i: fileListType) => item.fileNo === i.fileNo)
+        if (index === -1) {
+          formInline.value.fileList.push(item)
+        }
+      })
     }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    else {
+      const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
+      if (index !== -1) {
+        ElMessage.warning('此文件已添加过')
+        return
+      }
+      formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
+    }
   }
 }
 
@@ -912,6 +944,9 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddMeasureDevice">
+          批量添加
+        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
@@ -973,6 +1008,9 @@
     </detail-block>
     <detail-block title="所依据的技术文件">
       <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAddFiles">
+          批量添加
+        </el-button>
         <el-button type="primary" @click="addFilesRow">
           增加行
         </el-button>
@@ -1029,7 +1067,7 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
+  <select-measure-device v-model:visible="measureDeviceVisible" :is-multi="isMultiMeasureDevice" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
   <!-- 选择委托书组件 -->
@@ -1039,7 +1077,7 @@
   <!-- 选择原始记录模板 -->
   <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
   <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <select-files v-model:visible="filesVisible" :is-multi="isMultiFiles" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index ae41514..4a358d6 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -56,11 +56,12 @@
 const columns = ref<TableColumn[]>([
   { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 5de6775..f9c1af8 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -98,18 +98,18 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', width: '140', align: 'center' },
-  { text: '证书名称', value: 'certificateName', width: '120', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
-  { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '证书名称', value: 'certificateName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
-  { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
+  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '证书类型', value: 'certificateTypeName', align: 'center' },
   // { text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
-  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85px' },
-  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+  { text: '打印状态', value: 'printStatusName', align: 'center', width: '85' },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 表格数据
 const list = ref<ICerPrintList[]>([])
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 3c598e0..7d698e0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -35,8 +35,8 @@
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
-  isUrgent: '2', // 是否加急 //2全部
-  sampleBelong: '2', // 样品属性 //2全部
+  isUrgent: '', // 是否加急
+  sampleBelong: '', // 样品属性
   sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
@@ -95,11 +95,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部0进去
-    isUrgentMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2', // 是否加急全部后端定为2
-    })
+    // isUrgentMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2', // 是否加急全部后端定为2
+    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -110,11 +110,11 @@
       }
     })
     // 在已有的字典的基础上增加一个全部进去
-    sampleAttrMap.value.unshift({
-      id: '',
-      name: '全部',
-      value: '2',
-    })
+    // sampleAttrMap.value.unshift({
+    //   id: '',
+    //   name: '全部',
+    //   value: '2',
+    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -187,8 +187,8 @@
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
-    isUrgent: '2', // 是否加急
-    sampleBelong: '2', // 样品属性
+    isUrgent: '', // 是否加急
+    sampleBelong: '', // 样品属性
     sampleStatus: '', // 样品状态
     offset: 1,
     limit: 20,
@@ -528,7 +528,7 @@
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row, 'delete', '删除')"
+                @click="handleEdit(row, 'delete', '无需检测')"
               >
                 无需检测
               </el-button>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 83a076e..37ea804 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -169,7 +169,6 @@
   console.log(searchQuerySignature.signType)
   console.log(searchQueryAutograph.signType)
 }
-
 // 获取签章数据
 const getSignatureList = () => {
   listPageApi(searchQuerySignature).then((res) => {
@@ -183,8 +182,14 @@
 const getAutographList = () => {
   listPageApi(searchQueryAutograph).then((res) => {
     if (res.code === 200) {
-      minioFileNameAutograph.value = res.data.rows[0].minioFileName
-      dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
     }
   })
 }
@@ -207,7 +212,7 @@
 // 点击提交
 const submit = () => {}
 
-// ------------------------委托书-----------------------------
+// ----------------------------委托书----------------------------------------------------
 // 点击选择委托书编号
 const handleClickOrder = () => {
   orderVisible.value = true
@@ -406,6 +411,8 @@
     }
     getSignatureList() // 获取签章数据
     fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
   })
 })
 </script>
@@ -767,17 +774,14 @@
           <span class="title">乙方</span>
 
           <div class="deliverer-time">
-            <div class="img">
-              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            <div style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
-            <div class="img-name">
-              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
-            </div>
-
-            <span class="text-title">接收人:</span>
             <div style="margin-top: 30px;">
               <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
               <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
             </div>
           </div>
         </div>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 317bd1d..05a829c 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -359,7 +359,7 @@
           <el-table-column label="操作" align="center" fixed="right" width="170">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                v-if="proxy.hasPerm('/schedule/orderList/edit') && (row.statusName === '未接收' || row.statusName === '已接收')"
                 size="small"
                 type="primary"
                 link
@@ -377,7 +377,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                v-if="proxy.hasPerm('/schedule/orderList/receive') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
@@ -387,7 +387,7 @@
                 接收
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                v-if="proxy.hasPerm('/schedule/orderList/back') && row.statusName === '未接收'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index e045051..e12d03b 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -27,11 +27,6 @@
 })
 const printStatusList = [
   {
-    name: '全部',
-    value: '',
-
-  },
-  {
     name: '未打印',
     value: '0',
 
@@ -228,6 +223,7 @@
             v-model="listQuery.printStatus"
             placeholder="打印状态"
             class="short-input"
+            clearable
           >
             <el-option v-for="(item, index) in printStatusList" :key="index" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/device/bench/deviceBench.vue b/src/views/device/bench/deviceBench.vue
index 25103f4..e946737 100644
--- a/src/views/device/bench/deviceBench.vue
+++ b/src/views/device/bench/deviceBench.vue
@@ -24,7 +24,7 @@
 // 设备台账检定提醒表头
 const standingBookTableHead = [
   { text: '设备名称', value: 'equipmentName' },
-  { text: '负责人', value: 'usePersonName', width: '120' },
+  { text: '使用人', value: 'usePersonName', width: '120' },
   { text: '上次检定时间', value: 'mesureDate', width: '180' },
 ]
 
@@ -48,8 +48,8 @@
 // 标准装置到期提醒表头
 const standardTableHead = [
   { text: '标准名称', value: 'standardName', align: 'center' },
-  { text: '负责人', value: 'standardOwnerName', align: 'center' },
-  { text: '有效日期', value: 'preparationDate', width: '180', align: 'center' },
+  { text: '负责人', value: 'laboratoryOwnerName', align: 'center' },
+  { text: '有效日期', value: 'validTime', width: '180', align: 'center' },
 ]
 const total = ref(20)
 
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index c2b46c0..54f1232 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -238,7 +238,7 @@
     createUser: '', // 创建人
     createStartTime: '', // 创建开始时间
     createEndTime: '', // 创建结束时间
-    approvalStatus: approvalStatus.value, // 审批状态
+    approvalStatus: searchQuery.value.approvalStatus, // 审批状态
     limit: 20,
     offset: 1,
     fileType: '', // 文件类别
@@ -283,6 +283,7 @@
   // approvalStatus.value = approvalStatusReserveMap.value[props.name] // 失效
   searchQuery.value.approvalStatus = approvalStatusReserveMap.value[props.name] || '0'
   $router.currentRoute.value.query.cacheActive = searchQuery.value.approvalStatus
+
   getList()
   // 缓存名称
 }, { deep: true, immediate: true })