diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 5c6031d..8448eff 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -330,9 +330,6 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
-  if ($route.query.fromModule === 'workbench') {
-    approvalStatus.value = '2' // 待审批
-  }
   getFileType()
   getList()
 })

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 5c6031d..8448eff 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -330,9 +330,6 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
-  if ($route.query.fromModule === 'workbench') {
-    approvalStatus.value = '2' // 待审批
-  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c47b32d..1198b22 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -363,7 +363,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/agree') && row.approvalStatusName === '待审批'"
                   size="small"
                   link
                   type="primary"
@@ -373,7 +373,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                   size="small"
                   link
                   type="primary"
@@ -383,7 +383,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                   size="small"
                   link
                   type="danger"
@@ -393,7 +393,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -412,7 +412,7 @@
                 </el-button>
                 <!-- 是发起者且审批中可以取消 -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/cancle') && row.approvalStatusName === '审批中'"
                   size="small"
                   link
                   type="info"
@@ -422,7 +422,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 5c6031d..8448eff 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -330,9 +330,6 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
-  if ($route.query.fromModule === 'workbench') {
-    approvalStatus.value = '2' // 待审批
-  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c47b32d..1198b22 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -363,7 +363,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/agree') && row.approvalStatusName === '待审批'"
                   size="small"
                   link
                   type="primary"
@@ -373,7 +373,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                   size="small"
                   link
                   type="primary"
@@ -383,7 +383,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                   size="small"
                   link
                   type="danger"
@@ -393,7 +393,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -412,7 +412,7 @@
                 </el-button>
                 <!-- 是发起者且审批中可以取消 -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/cancle') && row.approvalStatusName === '审批中'"
                   size="small"
                   link
                   type="info"
@@ -422,7 +422,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 35683e7..9b93a8a 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -14,6 +14,7 @@
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const taskId = ref('') // 任务id 用于审批
+const decisionItem = ref('')
 const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -161,7 +162,7 @@
   processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
   taskId.value = $route.query.taskId as string
-
+  decisionItem.value = $route.query.decisionItem as string
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(processId.value) // 查询审批记录
   }
@@ -176,10 +177,10 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '3'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '2'" type="danger" @click="clickBtn('拒绝')">
           拒绝
         </el-button>
         <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 5c6031d..8448eff 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -330,9 +330,6 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
-  if ($route.query.fromModule === 'workbench') {
-    approvalStatus.value = '2' // 待审批
-  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c47b32d..1198b22 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -363,7 +363,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/agree') && row.approvalStatusName === '待审批'"
                   size="small"
                   link
                   type="primary"
@@ -373,7 +373,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                   size="small"
                   link
                   type="primary"
@@ -383,7 +383,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                   size="small"
                   link
                   type="danger"
@@ -393,7 +393,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -412,7 +412,7 @@
                 </el-button>
                 <!-- 是发起者且审批中可以取消 -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/cancle') && row.approvalStatusName === '审批中'"
                   size="small"
                   link
                   type="info"
@@ -422,7 +422,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 35683e7..9b93a8a 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -14,6 +14,7 @@
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const taskId = ref('') // 任务id 用于审批
+const decisionItem = ref('')
 const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -161,7 +162,7 @@
   processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
   taskId.value = $route.query.taskId as string
-
+  decisionItem.value = $route.query.decisionItem as string
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(processId.value) // 查询审批记录
   }
@@ -176,10 +177,10 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '3'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '2'" type="danger" @click="clickBtn('拒绝')">
           拒绝
         </el-button>
         <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index d262217..2d52594 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -354,9 +354,6 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
-  if ($route.query.fromModule === 'workbench') {
-    listQuery.value.approvalStatus = '2' // 待审批
-  }
   fetchData(true)
 })
 </script>

diff --git a/.env.development b/.env.development
index 3b872c5..a4749dc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,14 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:11309
-# VITE_APP_API_BASEURL = http://111.198.10.15:21409
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
-
-# VITE_APP_API_BASEURL = http://192.168.2.96:8085
-# VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.83.30:5909
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/reader.ts b/src/api/reader.ts
new file mode 100644
index 0000000..d21d618
--- /dev/null
+++ b/src/api/reader.ts
@@ -0,0 +1,20 @@
+// 读写器或扫码枪相关接口
+import axios from 'axios'
+import request from './index'
+const readerType: { [key: string]: string } = {
+  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+}
+// 获取大读写器读写内容
+export function getReadList(type: string) {
+  return axios.get(readerType[type])
+}
+
+// 获取读写器识别的样品列表
+export function getReaderSampleList(data: Object) {
+  return request({
+    url: '/business/readWriter/sample/readList',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 4e160a5..23c89ad 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -1,9 +1,10 @@
 <!-- 扫描操作弹窗 -->
 <script setup lang="ts" name="BarCodeBind">
 import { ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { ISampleScan } from './scan-interface'
 import scanImg from '@/assets/images/scan.png'
+import { getReadList, getReaderSampleList } from '@/api/reader'
 // 扫描状态,未开始0，正在扫描1，扫描结束2
 
 const props = defineProps({
@@ -26,30 +27,42 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
-  ElMessageBox.confirm(
+  if (list.value.length) {
+    ElMessageBox.confirm(
     `确认${props.title}列表中全部样品吗？`,
     '提示',
     { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-  ).then(() => {
-    emits('confirm', list.value)
-  })
+    ).then(() => {
+      emits('confirm', list.value)
+    })
+  }
+  else {
+    ElMessage.warning('暂无样品数据, 请重新扫描或取消')
+  }
 }
 
 // 扫描/ 重新扫描
 const scan = () => {
   // 扫描到的标签及样品信息列表
-  list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', sampleModel: 'JBT-011', manufacturingNo: '24432231124', sampleId: '1', orderId: '123', labelBind: '12345648' },
-  ]
-  scanStatus.value = '2'
+  getReadList('readerWriter').then((res) => {
+    const response = res.data
+    if (response.code === 200 && response.data.length) {
+      getReaderSampleList(response.data).then((res) => {
+        list.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning(res.data.message)
+    }
+    scanStatus.value = '2' // 扫描完成
+  }).catch(() => {
+    ElMessage.warning('扫描出错，请联系管理员')
+  })
 }
 // 重新扫描
 const reScan = () => {
-  scanStatus.value = '1'
-  setTimeout(() => {
-    scan()
-  }, 3000)
+  scanStatus.value = '1' // 正在扫描
+  scan()
 }
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
@@ -73,7 +86,7 @@
   <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
-        <div>请使用扫码枪扫描样品标签</div>
+        <div>请使用扫码枪或读写器扫描样品标签</div>
         <el-image :src="scanImg" class="scan-img" />
       </div>
       <!-- 扫描结果 -->
@@ -86,12 +99,12 @@
           <el-table-column prop="sampleNo" label="样品编号" align="center" />
           <el-table-column prop="sampleName" label="样品名称" align="center" />
           <el-table-column prop="sampleModel" label="型号" align="center" />
-          <el-table-column prop="manufacture" label="出厂编号" align="center" />
-          <el-table-column prop="orderNo" label="委托书编号" align="center" />
-          <el-table-column prop="customerNo" label="委托方代码" align="center" />
-          <el-table-column prop="customerName" label="委托方名称" align="center" />
+          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
+          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
+          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
+          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
           <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column prop="labelBind" label="操作" align="center" width="60px">
+          <el-table-column label="操作" align="center" width="60px">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
diff --git a/src/views/business/board/standardReminder/baseInfo.vue b/src/views/business/board/standardReminder/baseInfo.vue
index fd42a2a..83b0778 100644
--- a/src/views/business/board/standardReminder/baseInfo.vue
+++ b/src/views/business/board/standardReminder/baseInfo.vue
@@ -603,6 +603,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -615,6 +617,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -694,6 +698,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index f023ea2..39bb89a 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -205,7 +205,7 @@
       if (index === -1) {
         form.value.meterStaffList.push({
           ...item,
-          deptName: item.deptId,
+          deptName: item.deptName,
         })
       }
     })
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index 85889ed..76e76dc 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -1,4 +1,4 @@
-<!-- 现场检测记录列表 -->
+<!-- 现场检测审批列表 -->
 <script lang="ts" setup name="FieldTestRecordList">
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
diff --git a/src/views/business/fieldTest/components/selectStaffList.vue b/src/views/business/fieldTest/components/selectStaffList.vue
index 56b2777..4e6da78 100644
--- a/src/views/business/fieldTest/components/selectStaffList.vue
+++ b/src/views/business/fieldTest/components/selectStaffList.vue
@@ -35,7 +35,7 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   // { text: '学历', value: 'education', align: 'center' },
   // { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   // { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   // { text: '计量专业', value: 'major', align: 'center' },
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index e3b85bb..35bd15a 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -268,6 +268,16 @@
   fileRef.value.click()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  $router.push({
+    path: '/lab/primitiveLogList/add',
+    query: {
+      ...sampleForm.value,
+    },
+  })
+}
+
 onMounted(() => {
   console.log($route)
   // 从路由中获取页面类型参数
@@ -288,6 +298,9 @@
   <app-container>
     <detail-page title="样品详情">
       <template #btns>
+        <el-button v-if="roleType === 'detail'" type="primary" @click="createPrimitiveLog">
+          生成原始记录
+        </el-button>
         <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 8e40674..d73e956 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -10,9 +10,10 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
-import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
+import { getMyMeasureList, getTaskDetail, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -275,6 +276,19 @@
   clearList()
 }
 
+// 点击生成原始记录
+const createPrimitiveLog = (row: any) => {
+  // 获取任务详情
+  getTaskDetail({ orderId: row.orderId, sampleId: row.sampleId }).then((res) => {
+    $router.push({
+      path: '/lab/primitiveLogList/add',
+      query: {
+        ...res.data,
+      },
+    })
+  })
+}
+
 watch(timeRange, (val) => {
   if (val) {
     listQuery.value.startTime = `${val[0]}`
@@ -376,7 +390,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="200">
             <template #default="{ row }">
               <el-button size="small" link type="primary" @click="handleDetail(row)">
                 详情
@@ -390,6 +404,9 @@
               <el-button v-if="listQuery.measureStatus === '3'" size="small" type="primary" link @click="mearsureOver(row)">
                 检测完成
               </el-button>
+              <el-button size="small" type="primary" link @click="createPrimitiveLog(row)">
+                生成原始记录
+              </el-button>
             </template>
           </el-table-column>
         </template>
@@ -399,7 +416,7 @@
       <!-- 批量收入弹窗 -->
       <scan-sample-dialog ref="scanSampleRef" @confirm="scanOver" />
       <!-- 批量捡完弹窗 -->
-      <scan-sample-dialog ref="scanOverRef" title="批量捡完" @confirm="scanMeasureOver" />
+      <scan-sample-dialog ref="scanOverRef" title="批量检完" @confirm="scanMeasureOver" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 8fdc5c9..9f2b522 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -174,7 +174,7 @@
   'originalRecordName': [{ required: true, message: '原始记录名称必填', trigger: ['blur', 'change'] }],
   'measureCategory': [{ required: true, message: '校验类别必填', trigger: ['blur', 'change'] }],
   'calibrationTime': [{ required: true, message: '校验时间必填', trigger: ['blur', 'change'] }],
-  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
+  // 'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号必填', trigger: ['blur', 'change'] }],
   'calibrationPlace': [{ required: true, message: '校验地点必填', trigger: ['blur', 'change'] }],
   'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度必填', trigger: ['blur', 'change'] },
@@ -258,11 +258,19 @@
       return
     }
   }
-  if (!formInline.value.fileList.length) {
-    ElMessage.warning('所依据的技术文件不能为空')
-    return
-  }
-  else {
+  // if (!formInline.value.fileList.length) {
+  //   ElMessage.warning('所依据的技术文件不能为空')
+  //   return
+  // }
+  // else {
+  //   // 检查表格是否存在增加行信息没有完善的情况
+  //   const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+  //   if (result !== 'pass') {
+  //     ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+  //     return
+  //   }
+  // }
+  if (formInline.value.fileList.length) {
     // 检查表格是否存在增加行信息没有完善的情况
     const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
     if (result !== 'pass') {
@@ -557,9 +565,56 @@
 
 onMounted(() => {
   getDict() // 获取字典
-  if (pageType.value === 'edit' || pageType.value === 'detail') {
+  if (pageType.value === 'edit' || pageType.value === 'detail') { // 编辑和详情
     fetchDetail()
   }
+  else { // 新建
+    const params = $route.query
+    console.log('ppppp', params)
+
+    formInline.value = {
+      originalRecordCode: '', // 原始记录编号
+      originalRecordName: '', // 原始记录名称
+      measureCategory: '', // 检校类别
+      calibrationTime: '', // 		检校时间
+      environmentId: '', // 环境记录单id
+      calibrationPlace: '', // 检校地点
+      orderId: params.orderId as string, // 	委托书id
+      customerId: params.customerId as string, // 	委托方id
+      sampleId: params.sampleId as string, // 	样品id
+      templateId: '', // 	原始记录模板id
+      templateName: '', // 原始记录模板名称
+      originalRecordFile: '', // 	minio存储文件名--附件
+      remark: '', // 备注
+      createUser: '', // 创建人id
+      businessEnvironmentRecord: {
+        temperature: '', // 环境记录单温度
+        humidity: '', // 环境记录单相对湿度
+        environmentCode: '', // 环境记录单编号
+      }, // 环境记录单信息
+      businessOrder: { // 委托书
+        orderCode: params.orderCode as string || '', // 委托书编号
+        customerNo: params.customerNo as string || '', // 委托方代码
+        customerName: params.customerName as string || '', // 委托方名称
+        customerPhone: params.phone as string || '', // 委托方电话
+        customerAddress: params.customerAddress as string || '', // 委托方地址
+        planDeliverTime: params.planDeliverTime as string || '', // 预计送达时间
+        requireOverTime: params.requireOverTime as string || '', // 要求检完时间
+      },
+      customerSampleInfo: { // 样品信息
+        sampleNo: params.sampleNo as string || '', // 样品编号
+        sampleName: params.sampleName as string || '', // 样品名称
+        manufacturingNo: params.manufacturingNo as string || '', // 出厂编号
+        sampleModel: params.sampleModel as string || '', // 型号
+        manufacturer: params.manufacturer as string || '', // 生产厂家
+        deliverer: params.deliverer as string || '', // 送检人
+        delivererTel: params.delivererTel as string || '', // 送检人联系方式
+        measureContent: params.measureContent as string || '', // 检定项目
+      },
+      equipmentInfoList: [] as any, // 测量设备
+      fileList: [] as any, // 技术文件
+    }
+  }
 })
 </script>
 
@@ -682,7 +737,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -692,7 +747,7 @@
                 v-model.trim="formInline.businessEnvironmentRecord.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
-                disabled
+                :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''"
               />
             </el-form-item>
           </el-col>
@@ -721,7 +776,7 @@
             <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
               <el-input
                 v-model.trim="formInline.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -732,7 +787,7 @@
             <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
                 v-model.trim="formInline.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -743,7 +798,7 @@
             <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
                 v-model.trim="formInline.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -756,7 +811,7 @@
             <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
                 v-model.trim="formInline.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -767,7 +822,7 @@
             <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -787,7 +842,7 @@
             <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -800,7 +855,7 @@
             <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -811,7 +866,7 @@
             <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入型号'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -822,7 +877,7 @@
             <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -833,7 +888,7 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入送检人'"
                 class="full-width-input"
                 clearable
                 disabled
@@ -858,7 +913,7 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 value-format="YYYY-MM-DD hh:mm:ss"
                 disabled
@@ -871,7 +926,7 @@
                 v-model="formInline.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
+                :placeholder="pageType === 'detail' ? ' ' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -885,7 +940,7 @@
             <el-form-item label="检定项目:" prop="customerSampleInfo.measureContent">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
                 disabled
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index a76b01d..8cd2655 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="standardListAdd">
+<script lang="ts" setup name="baseInfo">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 16c9e5d..4ef91e4 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1185,6 +1185,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '不确定度'"
                 class="full-width-input"
                 disabled
@@ -1197,6 +1199,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '测量范围'"
                 class="full-width-input"
                 disabled
@@ -1273,6 +1277,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '' : '备注'"
                 class="full-width-input"
                 disabled
@@ -1419,7 +1425,7 @@
     </detail-block>
   </app-container>
   <!-- 选择标准装置弹窗 -->
-  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle" @add="StandarAddRow" />
+  <standard-dialog ref="standarDialog" :title-type="$route.query.routeMetaTitle as string" @add="StandarAddRow" />
   <!-- 选择标准配套设备 -->
   <select-standard-auxiliary-equipment :id="tableId" ref="standardAuxiliaryEquipment" @add="equipmentAddRow" />
   <!-- 选择设备弹窗 -->
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 75c4faf..0f63926 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -609,6 +609,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -621,6 +623,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
                 clearable
@@ -700,6 +704,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
                 clearable
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index f30638d..3ff0a71 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -452,16 +452,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="测量范围" prop="mesureRange">
-            <el-input v-model.trim="ruleForm.mesureRange" :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
-        <el-col v-if="ruleForm.assetType === '1'" :span="6">
-          <el-form-item label="不确定度" prop="uncertainty">
-            <el-input v-model.trim="ruleForm.uncertainty" :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
-          </el-form-item>
-        </el-col>
         <el-col v-if="showAssetsItem" :span="6">
           <el-form-item v-if="ruleForm.assetType !== '3'" label="立卡年月" prop="cardEstablishmentDate">
             <el-date-picker
@@ -692,9 +682,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="24" class="marg">
-        <el-col :span="12">
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="测量范围" prop="mesureRange">
+            <el-input v-model.trim="ruleForm.mesureRange" type="textarea" autosize :placeholder="title === 'detail' ? '' : '测量范围'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="ruleForm.assetType === '1'" :span="18">
+          <el-form-item label="不确定度" prop="uncertainty">
+            <el-input v-model.trim="ruleForm.uncertainty" type="textarea" autosize :placeholder="title === 'detail' ? '' : '不确定度'" :disabled="title === 'detail'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="18">
           <el-form-item label="备注" prop="remark">
             <el-input v-model.trim="ruleForm.remark" :rows="3" type="textarea" autosize :placeholder="title === 'detail' ? ' ' : '备注'" :disabled="title === 'detail'" />
           </el-form-item>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 5c6031d..8448eff 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -330,9 +330,6 @@
     approvalStatus.value = approvalStatusListTow[getApproveFileMenu!] as string
     searchQuery.value.approvalStatus = approvalStatus.value
   }
-  if ($route.query.fromModule === 'workbench') {
-    approvalStatus.value = '2' // 待审批
-  }
   getFileType()
   getList()
 })
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c47b32d..1198b22 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -363,7 +363,7 @@
                   查看
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/agree') && row.approvalStatusName === '待审批'"
                   size="small"
                   link
                   type="primary"
@@ -373,7 +373,7 @@
                   同意
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                   size="small"
                   link
                   type="primary"
@@ -383,7 +383,7 @@
                   驳回
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                   size="small"
                   link
                   type="danger"
@@ -393,7 +393,7 @@
                   拒绝
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                   size="small"
                   link
                   type="primary"
@@ -412,7 +412,7 @@
                 </el-button>
                 <!-- 是发起者且审批中可以取消 -->
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/cancle') && row.approvalStatusName === '审批中'"
                   size="small"
                   link
                   type="info"
@@ -422,7 +422,7 @@
                   取消
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                  v-if="proxy.hasPerm('/measure/measureSource/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 35683e7..9b93a8a 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -14,6 +14,7 @@
 const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const taskId = ref('') // 任务id 用于审批
+const decisionItem = ref('')
 const processId = ref('') // 流程实例id
 const approvalType = ref('')
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -161,7 +162,7 @@
   processId.value = $route.query.processId as string// 流程实例id
   approvalStatusName.value = $route.query.approvalStatusName as string
   taskId.value = $route.query.taskId as string
-
+  decisionItem.value = $route.query.decisionItem as string
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(processId.value) // 查询审批记录
   }
@@ -176,10 +177,10 @@
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
         </el-button>
-        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '3'" type="primary" @click="clickBtn('驳回')">
           驳回
         </el-button>
-        <el-button v-if="approvalType === '2'" type="danger" @click="clickBtn('拒绝')">
+        <el-button v-if="approvalType === '2' && decisionItem !== '2'" type="danger" @click="clickBtn('拒绝')">
           拒绝
         </el-button>
         <el-button v-if="approvalType === '3'" type="info" @click="handleCancel()">
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index d262217..2d52594 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -354,9 +354,6 @@
     // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
     listQuery.value.approvalStatus = '0' // 全部
   }
-  if ($route.query.fromModule === 'workbench') {
-    listQuery.value.approvalStatus = '2' // 待审批
-  }
   fetchData(true)
 })
 </script>
diff --git a/vite.config.ts b/vite.config.ts
index 6b1cb1e..4e82a69 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,7 +28,8 @@
       port: 9000,
       proxy: {
         '/proxy': {
-          target: env.VITE_APP_API_BASEURL,
+          // target: env.VITE_APP_API_BASEURL,
+          target: 'http://127.0.0.1:8083',
           changeOrigin: command === 'serve' && env.VITE_OPEN_PROXY === 'true',
           rewrite: path => path.replace(/\/proxy/, ''),
           // headers: {