diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index bd91335..6648992 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,6 +1,8 @@
+<!-- 标准装置列表详情页 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -12,6 +14,7 @@
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
 import {
+  delRegulationAdd,
   getEquipmentDelete,
   getEquipmentListPage,
   getEquipmenteAdd,
@@ -23,11 +26,12 @@
   getuserListPage,
   setBatchAdd,
 } from '@/api/device/standard'
+
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
-  add: '新增',
+  add: '新建',
   detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
@@ -50,6 +54,7 @@
   name: string
   comp: any
 }
+// 表格菜单
 const menu = shallowRef<menuType[]>([
   { name: '计量人员', comp: TemplateTable },
   { name: '标准配套设备', comp: TemplateTable },
@@ -58,7 +63,7 @@
   { name: '稳定性考核记录', comp: TemplateTable },
   { name: '证书管理', comp: TemplateTable },
 ])
-if (pageType.value === 'edit') {
+if (pageType.value === 'edit' || pageType.value === 'add') {
   menu.value = [
     { name: '计量人员', comp: TemplateTable },
     { name: '标准配套设备', comp: TemplateTable },
@@ -102,6 +107,7 @@
 interface equipmentListPageItem {
   name: string
   equipmentName: string
+  validDate?: string // 有效日期
 }
 // 文件item类型
 interface regulationListPageItem {
@@ -110,12 +116,12 @@
 }
 // 计量人员表头
 const measurementPersonnelColumns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: '240' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效期', value: 'certificateDate', align: 'center', width: '120' },
 ])
 // 计量人员数据
 const measurementPersonnel = ref<measurementPersonnelType[]>([])
@@ -125,21 +131,26 @@
 function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
   getuserListPage({ id: infoId.value }).then((res) => {
-    measurementPersonnel.value = res.data.rows
+    measurementPersonnel.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+      }
+    })
     measurementPersonnelLoading.value = false
   })
 }
 
 // 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'name', align: 'center', width: '180' },
-  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '240' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '使用部门', value: 'useDept', align: 'center' },
-  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 // 标准配套设备数据
 const corollaryEquipment = ref<corollaryEquipmentType[]>([])
@@ -152,6 +163,7 @@
     corollaryEquipment.value = res.data.rows.map(
       (item: equipmentListPageItem) => {
         item.name = item.equipmentName
+        item.validDate = item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : ''
         return item
       },
     )
@@ -161,14 +173,15 @@
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'name', align: 'center' },
-  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center', width: '240' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
+// 获取检定规程
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
@@ -236,6 +249,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '测量标准装置', // 打印配置页上方的标题
@@ -272,7 +286,7 @@
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
 const listIndex = ref(0)
-// 新增计量人员
+// 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
@@ -285,7 +299,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增标准配套设备
+// 标准配套设备--点击增加行
 const corollaryEquipmentAddRow = () => {
   if (
     corollaryEquipment.value.length >= 1
@@ -302,7 +316,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增检定规程
+// 检定规程-- 点击增加行
 const regulationVerificationAddRow = () => {
   if (
     regulationVerification.value.length >= 1
@@ -359,14 +373,15 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        measurementPersonnel.value = measurementPersonnel.value.filter(
-          item => !measurementPersonnelSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([]) // 删除id
-        ids.value = measurementPersonnelSelectionList.value.map(item => item.id)
-        getUserBatchDelete({ ids: ids.value }).then((res) => {
+        // measurementPersonnel.value = measurementPersonnel.value.filter(
+        //   item => !measurementPersonnelSelectionList.value.includes(item),
+        // )
+        let ids = [] // 删除id
+        ids = measurementPersonnelSelectionList.value.map((item: any) => item.id)
+        getUserBatchDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchmeasurementPersonnel()
           }
         })
       })
@@ -382,15 +397,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        corollaryEquipment.value = corollaryEquipment.value.filter(
-          item => !corollaryEquipmentSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([])
-        ids.value = corollaryEquipmentSelectionList.value.map(item => item.id)
+        // corollaryEquipment.value = corollaryEquipment.value.filter(
+        //   item => !corollaryEquipmentSelectionList.value.includes(item),
+        // )
+        let ids = []
+        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
         // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids: ids.value }).then((res) => {
+        getEquipmentDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchcorollaryEquipment()
           }
         })
       })
@@ -406,9 +422,14 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        regulationVerification.value = regulationVerification.value.filter(
-          item => !regulationVerificationSelectionList.value.includes(item),
-        )
+        let ids = []
+        ids = regulationVerification.value.map((item: any) => item.id)
+        delRegulationAdd({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchregulationVerification()
+          }
+        })
       })
     }
     else {
@@ -416,39 +437,47 @@
     }
   }
 }
-// 选择完负责人的函数
+// 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
-  if (!measurementPersonnel.value.includes(object)) {
-    measurementPersonnel.value[listIndex.value] = object
-    measurementPersonnel.value[listIndex.value].standardEquipmentId
-      = infoId.value
-    measurementPersonnel.value[listIndex.value].userId = object.id
-    delete object.id
-    setBatchAdd(measurementPersonnel.value).then((res) => {})
+  const index = measurementPersonnel.value.findIndex(item => item.id === object.id && item.name === object.name)
+  if (index === -1) {
+    // measurementPersonnel.value[listIndex.value] = object
+    // measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    // measurementPersonnel.value[listIndex.value].userId = object.id
+    // delete object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {
+      fetchmeasurementPersonnel()
+    })
   }
   else {
     ElMessage.warning('该人员已经存在')
-    measurementPersonnel.value.splice(listIndex.value, 1)
+    fetchmeasurementPersonnel()
+    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
-// 选择完设备后
+// 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
-  if (!corollaryEquipment.value.includes(data)) {
+  const index = corollaryEquipment.value.findIndex((item: any) => item.equipmentNo === data.equipmentNo)
+  if (index === -1) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
     delete data.id
-    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {
+      fetchcorollaryEquipment()
+    })
   }
   else {
-    ElMessage.warning('该设备已经存在')
-    corollaryEquipment.value.splice(listIndex.value, 1)
+    ElMessage.warning('该设备已存在')
+    // corollaryEquipment.value.splice(listIndex.value, 1)
+    fetchcorollaryEquipment()
   }
 }
-// 检定规程选择完成后
+// 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
-  if (!regulationVerification.value.includes(data)) {
+  const index = regulationVerification.value.findIndex((item: any) => item.fileNo === data.fileNo)
+  if (index === -1) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId
       = infoId.value
@@ -456,12 +485,13 @@
     regulationVerification.value[listIndex.value].name = data.fileName
     delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => {},
+      (res) => { fetchregulationVerification() },
     )
   }
   else {
-    ElMessage.warning('该文件已经存在')
-    regulationVerification.value.splice(listIndex.value, 1)
+    ElMessage.warning('该文件已存在')
+    fetchregulationVerification()
+    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
@@ -496,14 +526,14 @@
 
 <template>
   <app-container>
-    <detail-page :title="`标准装置${textMap[pageType]}`">
+    <detail-page :title="`标准装置--${textMap[pageType]}`">
       <template #btns>
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
           @click="submitForm()"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -517,13 +547,11 @@
         ref="baseInfoRef"
         :info-id="infoId"
         :button-type="pageType"
-        @setData="setData"
+        @set-data="setData"
       />
     </detail-page>
-    <detail-block-switch
-      v-if="pageType === 'detail' || pageType === 'edit'"
-      :title="pageType === 'detail' ? '' : current"
-    >
+    <!-- 表格区域 -->
+    <detail-block-switch :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button
@@ -558,8 +586,8 @@
         :columns="measurementPersonnelColumns"
         :list="measurementPersonnel"
         :loading="measurementPersonnelLoading"
-        @selectPerson="selectPerson"
-        @handleSelectionChange="handleSelectionChange"
+        @select-person="selectPerson"
+        @handle-selection-change="handleSelectionChange"
         @change-page="fetchmeasurementPersonnel"
       />
       <template-table
@@ -569,9 +597,9 @@
         :columns="corollaryEquipmentColumns"
         :list="corollaryEquipment"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchcorollaryEquipment"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '检定规程'"
@@ -580,9 +608,9 @@
         :columns="regulationVerificationColumns"
         :list="regulationVerification"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchregulationVerification"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '重复性考核记录'"

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index bd91335..6648992 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,6 +1,8 @@
+<!-- 标准装置列表详情页 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -12,6 +14,7 @@
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
 import {
+  delRegulationAdd,
   getEquipmentDelete,
   getEquipmentListPage,
   getEquipmenteAdd,
@@ -23,11 +26,12 @@
   getuserListPage,
   setBatchAdd,
 } from '@/api/device/standard'
+
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
-  add: '新增',
+  add: '新建',
   detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
@@ -50,6 +54,7 @@
   name: string
   comp: any
 }
+// 表格菜单
 const menu = shallowRef<menuType[]>([
   { name: '计量人员', comp: TemplateTable },
   { name: '标准配套设备', comp: TemplateTable },
@@ -58,7 +63,7 @@
   { name: '稳定性考核记录', comp: TemplateTable },
   { name: '证书管理', comp: TemplateTable },
 ])
-if (pageType.value === 'edit') {
+if (pageType.value === 'edit' || pageType.value === 'add') {
   menu.value = [
     { name: '计量人员', comp: TemplateTable },
     { name: '标准配套设备', comp: TemplateTable },
@@ -102,6 +107,7 @@
 interface equipmentListPageItem {
   name: string
   equipmentName: string
+  validDate?: string // 有效日期
 }
 // 文件item类型
 interface regulationListPageItem {
@@ -110,12 +116,12 @@
 }
 // 计量人员表头
 const measurementPersonnelColumns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: '240' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效期', value: 'certificateDate', align: 'center', width: '120' },
 ])
 // 计量人员数据
 const measurementPersonnel = ref<measurementPersonnelType[]>([])
@@ -125,21 +131,26 @@
 function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
   getuserListPage({ id: infoId.value }).then((res) => {
-    measurementPersonnel.value = res.data.rows
+    measurementPersonnel.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+      }
+    })
     measurementPersonnelLoading.value = false
   })
 }
 
 // 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'name', align: 'center', width: '180' },
-  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '240' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '使用部门', value: 'useDept', align: 'center' },
-  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 // 标准配套设备数据
 const corollaryEquipment = ref<corollaryEquipmentType[]>([])
@@ -152,6 +163,7 @@
     corollaryEquipment.value = res.data.rows.map(
       (item: equipmentListPageItem) => {
         item.name = item.equipmentName
+        item.validDate = item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : ''
         return item
       },
     )
@@ -161,14 +173,15 @@
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'name', align: 'center' },
-  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center', width: '240' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
+// 获取检定规程
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
@@ -236,6 +249,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '测量标准装置', // 打印配置页上方的标题
@@ -272,7 +286,7 @@
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
 const listIndex = ref(0)
-// 新增计量人员
+// 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
@@ -285,7 +299,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增标准配套设备
+// 标准配套设备--点击增加行
 const corollaryEquipmentAddRow = () => {
   if (
     corollaryEquipment.value.length >= 1
@@ -302,7 +316,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增检定规程
+// 检定规程-- 点击增加行
 const regulationVerificationAddRow = () => {
   if (
     regulationVerification.value.length >= 1
@@ -359,14 +373,15 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        measurementPersonnel.value = measurementPersonnel.value.filter(
-          item => !measurementPersonnelSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([]) // 删除id
-        ids.value = measurementPersonnelSelectionList.value.map(item => item.id)
-        getUserBatchDelete({ ids: ids.value }).then((res) => {
+        // measurementPersonnel.value = measurementPersonnel.value.filter(
+        //   item => !measurementPersonnelSelectionList.value.includes(item),
+        // )
+        let ids = [] // 删除id
+        ids = measurementPersonnelSelectionList.value.map((item: any) => item.id)
+        getUserBatchDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchmeasurementPersonnel()
           }
         })
       })
@@ -382,15 +397,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        corollaryEquipment.value = corollaryEquipment.value.filter(
-          item => !corollaryEquipmentSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([])
-        ids.value = corollaryEquipmentSelectionList.value.map(item => item.id)
+        // corollaryEquipment.value = corollaryEquipment.value.filter(
+        //   item => !corollaryEquipmentSelectionList.value.includes(item),
+        // )
+        let ids = []
+        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
         // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids: ids.value }).then((res) => {
+        getEquipmentDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchcorollaryEquipment()
           }
         })
       })
@@ -406,9 +422,14 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        regulationVerification.value = regulationVerification.value.filter(
-          item => !regulationVerificationSelectionList.value.includes(item),
-        )
+        let ids = []
+        ids = regulationVerification.value.map((item: any) => item.id)
+        delRegulationAdd({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchregulationVerification()
+          }
+        })
       })
     }
     else {
@@ -416,39 +437,47 @@
     }
   }
 }
-// 选择完负责人的函数
+// 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
-  if (!measurementPersonnel.value.includes(object)) {
-    measurementPersonnel.value[listIndex.value] = object
-    measurementPersonnel.value[listIndex.value].standardEquipmentId
-      = infoId.value
-    measurementPersonnel.value[listIndex.value].userId = object.id
-    delete object.id
-    setBatchAdd(measurementPersonnel.value).then((res) => {})
+  const index = measurementPersonnel.value.findIndex(item => item.id === object.id && item.name === object.name)
+  if (index === -1) {
+    // measurementPersonnel.value[listIndex.value] = object
+    // measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    // measurementPersonnel.value[listIndex.value].userId = object.id
+    // delete object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {
+      fetchmeasurementPersonnel()
+    })
   }
   else {
     ElMessage.warning('该人员已经存在')
-    measurementPersonnel.value.splice(listIndex.value, 1)
+    fetchmeasurementPersonnel()
+    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
-// 选择完设备后
+// 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
-  if (!corollaryEquipment.value.includes(data)) {
+  const index = corollaryEquipment.value.findIndex((item: any) => item.equipmentNo === data.equipmentNo)
+  if (index === -1) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
     delete data.id
-    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {
+      fetchcorollaryEquipment()
+    })
   }
   else {
-    ElMessage.warning('该设备已经存在')
-    corollaryEquipment.value.splice(listIndex.value, 1)
+    ElMessage.warning('该设备已存在')
+    // corollaryEquipment.value.splice(listIndex.value, 1)
+    fetchcorollaryEquipment()
   }
 }
-// 检定规程选择完成后
+// 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
-  if (!regulationVerification.value.includes(data)) {
+  const index = regulationVerification.value.findIndex((item: any) => item.fileNo === data.fileNo)
+  if (index === -1) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId
       = infoId.value
@@ -456,12 +485,13 @@
     regulationVerification.value[listIndex.value].name = data.fileName
     delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => {},
+      (res) => { fetchregulationVerification() },
     )
   }
   else {
-    ElMessage.warning('该文件已经存在')
-    regulationVerification.value.splice(listIndex.value, 1)
+    ElMessage.warning('该文件已存在')
+    fetchregulationVerification()
+    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
@@ -496,14 +526,14 @@
 
 <template>
   <app-container>
-    <detail-page :title="`标准装置${textMap[pageType]}`">
+    <detail-page :title="`标准装置--${textMap[pageType]}`">
       <template #btns>
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
           @click="submitForm()"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -517,13 +547,11 @@
         ref="baseInfoRef"
         :info-id="infoId"
         :button-type="pageType"
-        @setData="setData"
+        @set-data="setData"
       />
     </detail-page>
-    <detail-block-switch
-      v-if="pageType === 'detail' || pageType === 'edit'"
-      :title="pageType === 'detail' ? '' : current"
-    >
+    <!-- 表格区域 -->
+    <detail-block-switch :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button
@@ -558,8 +586,8 @@
         :columns="measurementPersonnelColumns"
         :list="measurementPersonnel"
         :loading="measurementPersonnelLoading"
-        @selectPerson="selectPerson"
-        @handleSelectionChange="handleSelectionChange"
+        @select-person="selectPerson"
+        @handle-selection-change="handleSelectionChange"
         @change-page="fetchmeasurementPersonnel"
       />
       <template-table
@@ -569,9 +597,9 @@
         :columns="corollaryEquipmentColumns"
         :list="corollaryEquipment"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchcorollaryEquipment"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '检定规程'"
@@ -580,9 +608,9 @@
         :columns="regulationVerificationColumns"
         :list="regulationVerification"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchregulationVerification"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '重复性考核记录'"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index bd8af61..e2c869b 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,9 @@
+<!-- 标准装置列表 -->
 <script lang="ts" setup name="standardList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
@@ -34,6 +36,7 @@
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -74,7 +77,7 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '180',
+    width: '120',
     align: 'center',
   },
   {
@@ -107,7 +110,12 @@
   listQuery.value.preparationStartDate = preparationDate.value[0] || ''
   listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        preparationDate: item.preparationDate ? dayjs(item.preparationDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -165,6 +173,7 @@
     offset: 1, // 多少页
     limit: 20, // 一页多少条
   }
+  preparationDate.value = '' // 时间置空
   fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -180,7 +189,7 @@
 }
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 打印列表
 function printList() {
@@ -243,13 +252,9 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  standardName: string
-}
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (index: string, row: IStandardList) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -272,7 +277,7 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IStandardList, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
 </script>
@@ -336,9 +341,9 @@
         >
           <el-option
             v-for="item in standardUsersDeptList"
-            :key="item.id"
+            :key="item.deptId"
             :label="item.organizeName"
-            :value="item.id"
+            :value="item.deptId"
           />
         </el-select>
       </search-item>
@@ -364,8 +369,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index bd91335..6648992 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,6 +1,8 @@
+<!-- 标准装置列表详情页 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -12,6 +14,7 @@
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
 import {
+  delRegulationAdd,
   getEquipmentDelete,
   getEquipmentListPage,
   getEquipmenteAdd,
@@ -23,11 +26,12 @@
   getuserListPage,
   setBatchAdd,
 } from '@/api/device/standard'
+
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
-  add: '新增',
+  add: '新建',
   detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
@@ -50,6 +54,7 @@
   name: string
   comp: any
 }
+// 表格菜单
 const menu = shallowRef<menuType[]>([
   { name: '计量人员', comp: TemplateTable },
   { name: '标准配套设备', comp: TemplateTable },
@@ -58,7 +63,7 @@
   { name: '稳定性考核记录', comp: TemplateTable },
   { name: '证书管理', comp: TemplateTable },
 ])
-if (pageType.value === 'edit') {
+if (pageType.value === 'edit' || pageType.value === 'add') {
   menu.value = [
     { name: '计量人员', comp: TemplateTable },
     { name: '标准配套设备', comp: TemplateTable },
@@ -102,6 +107,7 @@
 interface equipmentListPageItem {
   name: string
   equipmentName: string
+  validDate?: string // 有效日期
 }
 // 文件item类型
 interface regulationListPageItem {
@@ -110,12 +116,12 @@
 }
 // 计量人员表头
 const measurementPersonnelColumns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: '240' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效期', value: 'certificateDate', align: 'center', width: '120' },
 ])
 // 计量人员数据
 const measurementPersonnel = ref<measurementPersonnelType[]>([])
@@ -125,21 +131,26 @@
 function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
   getuserListPage({ id: infoId.value }).then((res) => {
-    measurementPersonnel.value = res.data.rows
+    measurementPersonnel.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+      }
+    })
     measurementPersonnelLoading.value = false
   })
 }
 
 // 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'name', align: 'center', width: '180' },
-  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '240' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '使用部门', value: 'useDept', align: 'center' },
-  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 // 标准配套设备数据
 const corollaryEquipment = ref<corollaryEquipmentType[]>([])
@@ -152,6 +163,7 @@
     corollaryEquipment.value = res.data.rows.map(
       (item: equipmentListPageItem) => {
         item.name = item.equipmentName
+        item.validDate = item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : ''
         return item
       },
     )
@@ -161,14 +173,15 @@
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'name', align: 'center' },
-  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center', width: '240' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
+// 获取检定规程
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
@@ -236,6 +249,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '测量标准装置', // 打印配置页上方的标题
@@ -272,7 +286,7 @@
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
 const listIndex = ref(0)
-// 新增计量人员
+// 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
@@ -285,7 +299,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增标准配套设备
+// 标准配套设备--点击增加行
 const corollaryEquipmentAddRow = () => {
   if (
     corollaryEquipment.value.length >= 1
@@ -302,7 +316,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增检定规程
+// 检定规程-- 点击增加行
 const regulationVerificationAddRow = () => {
   if (
     regulationVerification.value.length >= 1
@@ -359,14 +373,15 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        measurementPersonnel.value = measurementPersonnel.value.filter(
-          item => !measurementPersonnelSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([]) // 删除id
-        ids.value = measurementPersonnelSelectionList.value.map(item => item.id)
-        getUserBatchDelete({ ids: ids.value }).then((res) => {
+        // measurementPersonnel.value = measurementPersonnel.value.filter(
+        //   item => !measurementPersonnelSelectionList.value.includes(item),
+        // )
+        let ids = [] // 删除id
+        ids = measurementPersonnelSelectionList.value.map((item: any) => item.id)
+        getUserBatchDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchmeasurementPersonnel()
           }
         })
       })
@@ -382,15 +397,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        corollaryEquipment.value = corollaryEquipment.value.filter(
-          item => !corollaryEquipmentSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([])
-        ids.value = corollaryEquipmentSelectionList.value.map(item => item.id)
+        // corollaryEquipment.value = corollaryEquipment.value.filter(
+        //   item => !corollaryEquipmentSelectionList.value.includes(item),
+        // )
+        let ids = []
+        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
         // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids: ids.value }).then((res) => {
+        getEquipmentDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchcorollaryEquipment()
           }
         })
       })
@@ -406,9 +422,14 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        regulationVerification.value = regulationVerification.value.filter(
-          item => !regulationVerificationSelectionList.value.includes(item),
-        )
+        let ids = []
+        ids = regulationVerification.value.map((item: any) => item.id)
+        delRegulationAdd({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchregulationVerification()
+          }
+        })
       })
     }
     else {
@@ -416,39 +437,47 @@
     }
   }
 }
-// 选择完负责人的函数
+// 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
-  if (!measurementPersonnel.value.includes(object)) {
-    measurementPersonnel.value[listIndex.value] = object
-    measurementPersonnel.value[listIndex.value].standardEquipmentId
-      = infoId.value
-    measurementPersonnel.value[listIndex.value].userId = object.id
-    delete object.id
-    setBatchAdd(measurementPersonnel.value).then((res) => {})
+  const index = measurementPersonnel.value.findIndex(item => item.id === object.id && item.name === object.name)
+  if (index === -1) {
+    // measurementPersonnel.value[listIndex.value] = object
+    // measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    // measurementPersonnel.value[listIndex.value].userId = object.id
+    // delete object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {
+      fetchmeasurementPersonnel()
+    })
   }
   else {
     ElMessage.warning('该人员已经存在')
-    measurementPersonnel.value.splice(listIndex.value, 1)
+    fetchmeasurementPersonnel()
+    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
-// 选择完设备后
+// 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
-  if (!corollaryEquipment.value.includes(data)) {
+  const index = corollaryEquipment.value.findIndex((item: any) => item.equipmentNo === data.equipmentNo)
+  if (index === -1) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
     delete data.id
-    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {
+      fetchcorollaryEquipment()
+    })
   }
   else {
-    ElMessage.warning('该设备已经存在')
-    corollaryEquipment.value.splice(listIndex.value, 1)
+    ElMessage.warning('该设备已存在')
+    // corollaryEquipment.value.splice(listIndex.value, 1)
+    fetchcorollaryEquipment()
   }
 }
-// 检定规程选择完成后
+// 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
-  if (!regulationVerification.value.includes(data)) {
+  const index = regulationVerification.value.findIndex((item: any) => item.fileNo === data.fileNo)
+  if (index === -1) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId
       = infoId.value
@@ -456,12 +485,13 @@
     regulationVerification.value[listIndex.value].name = data.fileName
     delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => {},
+      (res) => { fetchregulationVerification() },
     )
   }
   else {
-    ElMessage.warning('该文件已经存在')
-    regulationVerification.value.splice(listIndex.value, 1)
+    ElMessage.warning('该文件已存在')
+    fetchregulationVerification()
+    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
@@ -496,14 +526,14 @@
 
 <template>
   <app-container>
-    <detail-page :title="`标准装置${textMap[pageType]}`">
+    <detail-page :title="`标准装置--${textMap[pageType]}`">
       <template #btns>
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
           @click="submitForm()"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -517,13 +547,11 @@
         ref="baseInfoRef"
         :info-id="infoId"
         :button-type="pageType"
-        @setData="setData"
+        @set-data="setData"
       />
     </detail-page>
-    <detail-block-switch
-      v-if="pageType === 'detail' || pageType === 'edit'"
-      :title="pageType === 'detail' ? '' : current"
-    >
+    <!-- 表格区域 -->
+    <detail-block-switch :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button
@@ -558,8 +586,8 @@
         :columns="measurementPersonnelColumns"
         :list="measurementPersonnel"
         :loading="measurementPersonnelLoading"
-        @selectPerson="selectPerson"
-        @handleSelectionChange="handleSelectionChange"
+        @select-person="selectPerson"
+        @handle-selection-change="handleSelectionChange"
         @change-page="fetchmeasurementPersonnel"
       />
       <template-table
@@ -569,9 +597,9 @@
         :columns="corollaryEquipmentColumns"
         :list="corollaryEquipment"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchcorollaryEquipment"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '检定规程'"
@@ -580,9 +608,9 @@
         :columns="regulationVerificationColumns"
         :list="regulationVerification"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchregulationVerification"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '重复性考核记录'"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index bd8af61..e2c869b 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,9 @@
+<!-- 标准装置列表 -->
 <script lang="ts" setup name="standardList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
@@ -34,6 +36,7 @@
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -74,7 +77,7 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '180',
+    width: '120',
     align: 'center',
   },
   {
@@ -107,7 +110,12 @@
   listQuery.value.preparationStartDate = preparationDate.value[0] || ''
   listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        preparationDate: item.preparationDate ? dayjs(item.preparationDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -165,6 +173,7 @@
     offset: 1, // 多少页
     limit: 20, // 一页多少条
   }
+  preparationDate.value = '' // 时间置空
   fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -180,7 +189,7 @@
 }
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 打印列表
 function printList() {
@@ -243,13 +252,9 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  standardName: string
-}
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (index: string, row: IStandardList) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -272,7 +277,7 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IStandardList, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
 </script>
@@ -336,9 +341,9 @@
         >
           <el-option
             v-for="item in standardUsersDeptList"
-            :key="item.id"
+            :key="item.deptId"
             :label="item.organizeName"
-            :value="item.id"
+            :value="item.deptId"
           />
         </el-select>
       </search-item>
@@ -364,8 +369,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 11a7fe4..5f508e9 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -176,7 +176,8 @@
 export interface corollaryEquipmentType {
   name: string
   standardEquipmentId: string
-  equipmentId?: string
+  equipmentId?: string // 设备id
+  equipmentNo?: string // 设备编号
   id?: string
   equipmentName: string
 }
@@ -187,6 +188,7 @@
   standardEquipmentId: string
   verifyRegulationId?: string
   fileName: string
+  fileNo?: string // 文件号
   id?: string
 }
 

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index bd91335..6648992 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,6 +1,8 @@
+<!-- 标准装置列表详情页 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -12,6 +14,7 @@
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
 import {
+  delRegulationAdd,
   getEquipmentDelete,
   getEquipmentListPage,
   getEquipmenteAdd,
@@ -23,11 +26,12 @@
   getuserListPage,
   setBatchAdd,
 } from '@/api/device/standard'
+
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
-  add: '新增',
+  add: '新建',
   detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
@@ -50,6 +54,7 @@
   name: string
   comp: any
 }
+// 表格菜单
 const menu = shallowRef<menuType[]>([
   { name: '计量人员', comp: TemplateTable },
   { name: '标准配套设备', comp: TemplateTable },
@@ -58,7 +63,7 @@
   { name: '稳定性考核记录', comp: TemplateTable },
   { name: '证书管理', comp: TemplateTable },
 ])
-if (pageType.value === 'edit') {
+if (pageType.value === 'edit' || pageType.value === 'add') {
   menu.value = [
     { name: '计量人员', comp: TemplateTable },
     { name: '标准配套设备', comp: TemplateTable },
@@ -102,6 +107,7 @@
 interface equipmentListPageItem {
   name: string
   equipmentName: string
+  validDate?: string // 有效日期
 }
 // 文件item类型
 interface regulationListPageItem {
@@ -110,12 +116,12 @@
 }
 // 计量人员表头
 const measurementPersonnelColumns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: '240' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效期', value: 'certificateDate', align: 'center', width: '120' },
 ])
 // 计量人员数据
 const measurementPersonnel = ref<measurementPersonnelType[]>([])
@@ -125,21 +131,26 @@
 function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
   getuserListPage({ id: infoId.value }).then((res) => {
-    measurementPersonnel.value = res.data.rows
+    measurementPersonnel.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+      }
+    })
     measurementPersonnelLoading.value = false
   })
 }
 
 // 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'name', align: 'center', width: '180' },
-  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '240' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '使用部门', value: 'useDept', align: 'center' },
-  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 // 标准配套设备数据
 const corollaryEquipment = ref<corollaryEquipmentType[]>([])
@@ -152,6 +163,7 @@
     corollaryEquipment.value = res.data.rows.map(
       (item: equipmentListPageItem) => {
         item.name = item.equipmentName
+        item.validDate = item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : ''
         return item
       },
     )
@@ -161,14 +173,15 @@
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'name', align: 'center' },
-  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center', width: '240' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
+// 获取检定规程
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
@@ -236,6 +249,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '测量标准装置', // 打印配置页上方的标题
@@ -272,7 +286,7 @@
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
 const listIndex = ref(0)
-// 新增计量人员
+// 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
@@ -285,7 +299,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增标准配套设备
+// 标准配套设备--点击增加行
 const corollaryEquipmentAddRow = () => {
   if (
     corollaryEquipment.value.length >= 1
@@ -302,7 +316,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增检定规程
+// 检定规程-- 点击增加行
 const regulationVerificationAddRow = () => {
   if (
     regulationVerification.value.length >= 1
@@ -359,14 +373,15 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        measurementPersonnel.value = measurementPersonnel.value.filter(
-          item => !measurementPersonnelSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([]) // 删除id
-        ids.value = measurementPersonnelSelectionList.value.map(item => item.id)
-        getUserBatchDelete({ ids: ids.value }).then((res) => {
+        // measurementPersonnel.value = measurementPersonnel.value.filter(
+        //   item => !measurementPersonnelSelectionList.value.includes(item),
+        // )
+        let ids = [] // 删除id
+        ids = measurementPersonnelSelectionList.value.map((item: any) => item.id)
+        getUserBatchDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchmeasurementPersonnel()
           }
         })
       })
@@ -382,15 +397,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        corollaryEquipment.value = corollaryEquipment.value.filter(
-          item => !corollaryEquipmentSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([])
-        ids.value = corollaryEquipmentSelectionList.value.map(item => item.id)
+        // corollaryEquipment.value = corollaryEquipment.value.filter(
+        //   item => !corollaryEquipmentSelectionList.value.includes(item),
+        // )
+        let ids = []
+        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
         // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids: ids.value }).then((res) => {
+        getEquipmentDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchcorollaryEquipment()
           }
         })
       })
@@ -406,9 +422,14 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        regulationVerification.value = regulationVerification.value.filter(
-          item => !regulationVerificationSelectionList.value.includes(item),
-        )
+        let ids = []
+        ids = regulationVerification.value.map((item: any) => item.id)
+        delRegulationAdd({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchregulationVerification()
+          }
+        })
       })
     }
     else {
@@ -416,39 +437,47 @@
     }
   }
 }
-// 选择完负责人的函数
+// 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
-  if (!measurementPersonnel.value.includes(object)) {
-    measurementPersonnel.value[listIndex.value] = object
-    measurementPersonnel.value[listIndex.value].standardEquipmentId
-      = infoId.value
-    measurementPersonnel.value[listIndex.value].userId = object.id
-    delete object.id
-    setBatchAdd(measurementPersonnel.value).then((res) => {})
+  const index = measurementPersonnel.value.findIndex(item => item.id === object.id && item.name === object.name)
+  if (index === -1) {
+    // measurementPersonnel.value[listIndex.value] = object
+    // measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    // measurementPersonnel.value[listIndex.value].userId = object.id
+    // delete object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {
+      fetchmeasurementPersonnel()
+    })
   }
   else {
     ElMessage.warning('该人员已经存在')
-    measurementPersonnel.value.splice(listIndex.value, 1)
+    fetchmeasurementPersonnel()
+    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
-// 选择完设备后
+// 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
-  if (!corollaryEquipment.value.includes(data)) {
+  const index = corollaryEquipment.value.findIndex((item: any) => item.equipmentNo === data.equipmentNo)
+  if (index === -1) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
     delete data.id
-    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {
+      fetchcorollaryEquipment()
+    })
   }
   else {
-    ElMessage.warning('该设备已经存在')
-    corollaryEquipment.value.splice(listIndex.value, 1)
+    ElMessage.warning('该设备已存在')
+    // corollaryEquipment.value.splice(listIndex.value, 1)
+    fetchcorollaryEquipment()
   }
 }
-// 检定规程选择完成后
+// 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
-  if (!regulationVerification.value.includes(data)) {
+  const index = regulationVerification.value.findIndex((item: any) => item.fileNo === data.fileNo)
+  if (index === -1) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId
       = infoId.value
@@ -456,12 +485,13 @@
     regulationVerification.value[listIndex.value].name = data.fileName
     delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => {},
+      (res) => { fetchregulationVerification() },
     )
   }
   else {
-    ElMessage.warning('该文件已经存在')
-    regulationVerification.value.splice(listIndex.value, 1)
+    ElMessage.warning('该文件已存在')
+    fetchregulationVerification()
+    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
@@ -496,14 +526,14 @@
 
 <template>
   <app-container>
-    <detail-page :title="`标准装置${textMap[pageType]}`">
+    <detail-page :title="`标准装置--${textMap[pageType]}`">
       <template #btns>
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
           @click="submitForm()"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -517,13 +547,11 @@
         ref="baseInfoRef"
         :info-id="infoId"
         :button-type="pageType"
-        @setData="setData"
+        @set-data="setData"
       />
     </detail-page>
-    <detail-block-switch
-      v-if="pageType === 'detail' || pageType === 'edit'"
-      :title="pageType === 'detail' ? '' : current"
-    >
+    <!-- 表格区域 -->
+    <detail-block-switch :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button
@@ -558,8 +586,8 @@
         :columns="measurementPersonnelColumns"
         :list="measurementPersonnel"
         :loading="measurementPersonnelLoading"
-        @selectPerson="selectPerson"
-        @handleSelectionChange="handleSelectionChange"
+        @select-person="selectPerson"
+        @handle-selection-change="handleSelectionChange"
         @change-page="fetchmeasurementPersonnel"
       />
       <template-table
@@ -569,9 +597,9 @@
         :columns="corollaryEquipmentColumns"
         :list="corollaryEquipment"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchcorollaryEquipment"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '检定规程'"
@@ -580,9 +608,9 @@
         :columns="regulationVerificationColumns"
         :list="regulationVerification"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchregulationVerification"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '重复性考核记录'"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index bd8af61..e2c869b 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,9 @@
+<!-- 标准装置列表 -->
 <script lang="ts" setup name="standardList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
@@ -34,6 +36,7 @@
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -74,7 +77,7 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '180',
+    width: '120',
     align: 'center',
   },
   {
@@ -107,7 +110,12 @@
   listQuery.value.preparationStartDate = preparationDate.value[0] || ''
   listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        preparationDate: item.preparationDate ? dayjs(item.preparationDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -165,6 +173,7 @@
     offset: 1, // 多少页
     limit: 20, // 一页多少条
   }
+  preparationDate.value = '' // 时间置空
   fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -180,7 +189,7 @@
 }
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 打印列表
 function printList() {
@@ -243,13 +252,9 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  standardName: string
-}
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (index: string, row: IStandardList) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -272,7 +277,7 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IStandardList, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
 </script>
@@ -336,9 +341,9 @@
         >
           <el-option
             v-for="item in standardUsersDeptList"
-            :key="item.id"
+            :key="item.deptId"
             :label="item.organizeName"
-            :value="item.id"
+            :value="item.deptId"
           />
         </el-select>
       </search-item>
@@ -364,8 +369,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 11a7fe4..5f508e9 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -176,7 +176,8 @@
 export interface corollaryEquipmentType {
   name: string
   standardEquipmentId: string
-  equipmentId?: string
+  equipmentId?: string // 设备id
+  equipmentNo?: string // 设备编号
   id?: string
   equipmentName: string
 }
@@ -187,6 +188,7 @@
   standardEquipmentId: string
   verifyRegulationId?: string
   fileName: string
+  fileNo?: string // 文件号
   id?: string
 }
 
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index ab7ef87..b2e752f 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,13 +1,13 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -32,7 +32,7 @@
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '120' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '180' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '100' },
 ])
 // 获取部门
@@ -54,8 +54,9 @@
   }
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.records.map((item: { sex: string | number }) => {
+      list.value = res.data.records.map((item: { sex: string | number; certificateDate: string }) => {
         item.sex = sexMap[item.sex as keyof typeof sexMap]
+        item.certificateDate = item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : ''
         return item
       })
       total.value = parseInt(res.data.total)

diff --git a/.env.production b/.env.production
index 06442a5..ff5a80a 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-# VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.96:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 31f6b25..3a8447f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -189,6 +189,14 @@
     data,
   })
 }
+// 删除检定规程
+export function delRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/delete',
+    method: 'post',
+    data,
+  })
+}
 
 // 标准装置-检定规程列表（分页）
 export function getRegulationListPage(data: object) {
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..b39b99c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,5 +63,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    UploadMultiFiles: typeof import('./components/uploadMultiFiles/uploadMultiFiles.vue')['default']
   }
 }
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index abcada5..322a197 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -316,10 +316,10 @@
                 size="small"
                 type="primary"
                 link
-                :disabled="row.sampleSatusName !== ''"
+                :disabled="row.sampleSatusName"
                 @click="handleEdit(row, 'edit')"
               >
-                编辑
+                编辑{{ row.sampleSatusName }}
               </el-button>
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 9340b25..a2c536b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -1,4 +1,5 @@
-<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'
@@ -9,6 +10,7 @@
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: { // 详情id
@@ -22,7 +24,7 @@
 })
 const emit = defineEmits(['close', 'setData']) // 关闭
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单
 const formInline = ref({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
@@ -64,6 +66,7 @@
   uncertainty: '', // 不确定度
   updateTime: '', // 更新时间
   version: '', // 版本号
+  minioFileName: [], // 附件
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
@@ -145,7 +148,7 @@
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
   standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
-  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
@@ -159,6 +162,8 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+  totalInvestment: [{ required: false, message: '', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '投资总额只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
@@ -203,10 +208,10 @@
 }
 // 测试数据
 const simulateObject = {
-  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  data: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 有效日期
   certificateNo: '199926465422', // 证书编号
   authorityOfIssue: 'xxx公司', // 发证单位
-  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY-MM-DD'), // 发证日期
 }
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
@@ -220,6 +225,34 @@
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        formInline.value.minioFileName = res.data
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -248,7 +281,7 @@
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
+                :placeholder="buttonType === 'detail' ? '' : '系统自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -408,7 +441,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):" prop="totalInvestment">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
@@ -576,7 +609,7 @@
             <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度'"
                 :disabled="buttonType === 'detail'"
                 clearable
               />
@@ -587,7 +620,7 @@
               <el-input
                 v-model.trim="formInline.standardHumidity"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
@@ -635,17 +668,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -658,6 +680,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="24">
+            <el-form-item label="文件:">
+              <el-button v-if="buttonType !== 'detail'" id="file" type="primary" :disabled="buttonType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
+                {{ !formInline.minioFileName.length ? '上传' : '重新上传' }}
+              </el-button>
+              <div v-for="(item, index) in formInline.minioFileName" :key="index" style="display: flex;">
+                <show-photo :minio-file-name="item" />
+              </div>
+              <span v-if="buttonType === 'detail' && !formInline.minioFileName.length">无</span>
+              <input v-show="buttonType === ''" ref="fileRef" type="file" name="upload" multiple="multiple" @change="onFileChange">
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 9a315e1..02db09a 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -21,18 +21,24 @@
   {
     text: '设备名称',
     value: 'equipmentName',
+    align: 'center',
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '型号',
     value: 'manufacturer',
+    align: 'center',
   },
   {
     text: '管理状态',
     value: 'managerStateName',
+    align: 'center',
+
   }]
 // 获取数据列表
 const fetchData = () => {
@@ -57,7 +63,7 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -97,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -122,7 +128,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
index 4885585..fdf958e 100644
--- a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择标准科室 -->
+<script lang="ts" setup name="LaboratoryDialog">
 import { ElMessage } from 'element-plus'
 import { getUsersDept } from '@/api/device/standard'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -30,23 +30,26 @@
   {
     text: '科室编号',
     value: 'organizeNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '科室名称',
     value: 'organizeName',
+    align: 'center',
   },
   {
     text: '负责人',
     value: 'director',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJobName',
+    align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,6 +86,7 @@
     organizeType: '3',
     pDeptId: '',
   }
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -139,7 +143,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index e0409c5..a28d84b 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -1,5 +1,5 @@
 <!-- 表格记录 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="TemplateTable">
 import type { PropType } from 'vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 
diff --git a/src/views/device/standardEquipment/components/standardList/userListDialog.vue b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
index f2fec1b..5d062f7 100644
--- a/src/views/device/standardEquipment/components/standardList/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/userListDialog.vue
@@ -27,18 +27,23 @@
   {
     text: '姓名',
     value: 'name',
+    align: 'center',
   },
   {
     text: '人员编号',
     value: 'staffNo',
+    width: '160',
+    align: 'center',
   },
   {
     text: '所在部门',
     value: 'deptId',
+    align: 'center',
   },
   {
     text: '行政职务',
     value: 'administrationJob',
+    align: 'center',
   },
 ])
 const deptProps = reactive({
@@ -142,16 +147,16 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
-        <!-- <el-table-column label="#" width="55" align="center">
-          <template #default="scope">
-            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-          </template>
-        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 1a4a903..4744536 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -1,5 +1,5 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择检定规程 -->
+<script lang="ts" setup name="VerificationDialog">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/measure/file'
 import { getDeptTreeList } from '@/api/system/dept'
@@ -31,8 +31,8 @@
 const select = ref<number>(-1)
 const columns = ref<TableColumn[]>(
   [
-    { text: '文件名称', value: 'fileName' },
-    { text: '文件编号', value: 'fileNo' },
+    { text: '文件名称', value: 'fileName', align: 'center' },
+    { text: '文件编号', value: 'fileNo', width: '160', align: 'center' },
     { text: '文件号', value: 'fileCode', align: 'center' },
     { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
     { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
@@ -70,7 +70,7 @@
     publishEndTime: '',
     publishStartTime: '',
   }
-  selectTreeRef.value.clearSelected()
+  // selectTreeRef.value.clearSelected()
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -110,7 +110,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item class="short-input">
@@ -135,7 +135,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="" width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index bd91335..6648992 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,6 +1,8 @@
+<!-- 标准装置列表详情页 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -12,6 +14,7 @@
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
 import {
+  delRegulationAdd,
   getEquipmentDelete,
   getEquipmentListPage,
   getEquipmenteAdd,
@@ -23,11 +26,12 @@
   getuserListPage,
   setBatchAdd,
 } from '@/api/device/standard'
+
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
-  add: '新增',
+  add: '新建',
   detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
@@ -50,6 +54,7 @@
   name: string
   comp: any
 }
+// 表格菜单
 const menu = shallowRef<menuType[]>([
   { name: '计量人员', comp: TemplateTable },
   { name: '标准配套设备', comp: TemplateTable },
@@ -58,7 +63,7 @@
   { name: '稳定性考核记录', comp: TemplateTable },
   { name: '证书管理', comp: TemplateTable },
 ])
-if (pageType.value === 'edit') {
+if (pageType.value === 'edit' || pageType.value === 'add') {
   menu.value = [
     { name: '计量人员', comp: TemplateTable },
     { name: '标准配套设备', comp: TemplateTable },
@@ -102,6 +107,7 @@
 interface equipmentListPageItem {
   name: string
   equipmentName: string
+  validDate?: string // 有效日期
 }
 // 文件item类型
 interface regulationListPageItem {
@@ -110,12 +116,12 @@
 }
 // 计量人员表头
 const measurementPersonnelColumns = ref<TableColumn[]>([
-  { text: '姓名', value: 'name', align: 'center' },
+  { text: '姓名', value: 'name', align: 'center', width: '240' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效期', value: 'certificateDate', align: 'center', width: '120' },
 ])
 // 计量人员数据
 const measurementPersonnel = ref<measurementPersonnelType[]>([])
@@ -125,21 +131,26 @@
 function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
   getuserListPage({ id: infoId.value }).then((res) => {
-    measurementPersonnel.value = res.data.rows
+    measurementPersonnel.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : '',
+      }
+    })
     measurementPersonnelLoading.value = false
   })
 }
 
 // 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'name', align: 'center', width: '180' },
-  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '240' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
   { text: '使用部门', value: 'useDept', align: 'center' },
-  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
-  { text: '有效日期', value: 'validDate', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
 ])
 // 标准配套设备数据
 const corollaryEquipment = ref<corollaryEquipmentType[]>([])
@@ -152,6 +163,7 @@
     corollaryEquipment.value = res.data.rows.map(
       (item: equipmentListPageItem) => {
         item.name = item.equipmentName
+        item.validDate = item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : ''
         return item
       },
     )
@@ -161,14 +173,15 @@
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'name', align: 'center' },
-  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center', width: '240' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '160' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
+// 获取检定规程
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
@@ -236,6 +249,7 @@
     }
   })
 }
+// 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
   popTitle: '测量标准装置', // 打印配置页上方的标题
@@ -272,7 +286,7 @@
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
 const listIndex = ref(0)
-// 新增计量人员
+// 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
@@ -285,7 +299,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增标准配套设备
+// 标准配套设备--点击增加行
 const corollaryEquipmentAddRow = () => {
   if (
     corollaryEquipment.value.length >= 1
@@ -302,7 +316,7 @@
   }
   // ElMessage.warning('请先选择上一条信息')
 }
-// 新增检定规程
+// 检定规程-- 点击增加行
 const regulationVerificationAddRow = () => {
   if (
     regulationVerification.value.length >= 1
@@ -359,14 +373,15 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        measurementPersonnel.value = measurementPersonnel.value.filter(
-          item => !measurementPersonnelSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([]) // 删除id
-        ids.value = measurementPersonnelSelectionList.value.map(item => item.id)
-        getUserBatchDelete({ ids: ids.value }).then((res) => {
+        // measurementPersonnel.value = measurementPersonnel.value.filter(
+        //   item => !measurementPersonnelSelectionList.value.includes(item),
+        // )
+        let ids = [] // 删除id
+        ids = measurementPersonnelSelectionList.value.map((item: any) => item.id)
+        getUserBatchDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchmeasurementPersonnel()
           }
         })
       })
@@ -382,15 +397,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        corollaryEquipment.value = corollaryEquipment.value.filter(
-          item => !corollaryEquipmentSelectionList.value.includes(item),
-        )
-        const ids = ref<string[]>([])
-        ids.value = corollaryEquipmentSelectionList.value.map(item => item.id)
+        // corollaryEquipment.value = corollaryEquipment.value.filter(
+        //   item => !corollaryEquipmentSelectionList.value.includes(item),
+        // )
+        let ids = []
+        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
         // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids: ids.value }).then((res) => {
+        getEquipmentDelete({ ids }).then((res) => {
           if (res.code === 200) {
             ElMessage.success('删除成功')
+            fetchcorollaryEquipment()
           }
         })
       })
@@ -406,9 +422,14 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        regulationVerification.value = regulationVerification.value.filter(
-          item => !regulationVerificationSelectionList.value.includes(item),
-        )
+        let ids = []
+        ids = regulationVerification.value.map((item: any) => item.id)
+        delRegulationAdd({ ids }).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('删除成功')
+            fetchregulationVerification()
+          }
+        })
       })
     }
     else {
@@ -416,39 +437,47 @@
     }
   }
 }
-// 选择完负责人的函数
+// 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
-  if (!measurementPersonnel.value.includes(object)) {
-    measurementPersonnel.value[listIndex.value] = object
-    measurementPersonnel.value[listIndex.value].standardEquipmentId
-      = infoId.value
-    measurementPersonnel.value[listIndex.value].userId = object.id
-    delete object.id
-    setBatchAdd(measurementPersonnel.value).then((res) => {})
+  const index = measurementPersonnel.value.findIndex(item => item.id === object.id && item.name === object.name)
+  if (index === -1) {
+    // measurementPersonnel.value[listIndex.value] = object
+    // measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    // measurementPersonnel.value[listIndex.value].userId = object.id
+    // delete object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {
+      fetchmeasurementPersonnel()
+    })
   }
   else {
     ElMessage.warning('该人员已经存在')
-    measurementPersonnel.value.splice(listIndex.value, 1)
+    fetchmeasurementPersonnel()
+    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
-// 选择完设备后
+// 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
-  if (!corollaryEquipment.value.includes(data)) {
+  const index = corollaryEquipment.value.findIndex((item: any) => item.equipmentNo === data.equipmentNo)
+  if (index === -1) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
     delete data.id
-    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {
+      fetchcorollaryEquipment()
+    })
   }
   else {
-    ElMessage.warning('该设备已经存在')
-    corollaryEquipment.value.splice(listIndex.value, 1)
+    ElMessage.warning('该设备已存在')
+    // corollaryEquipment.value.splice(listIndex.value, 1)
+    fetchcorollaryEquipment()
   }
 }
-// 检定规程选择完成后
+// 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
-  if (!regulationVerification.value.includes(data)) {
+  const index = regulationVerification.value.findIndex((item: any) => item.fileNo === data.fileNo)
+  if (index === -1) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId
       = infoId.value
@@ -456,12 +485,13 @@
     regulationVerification.value[listIndex.value].name = data.fileName
     delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => {},
+      (res) => { fetchregulationVerification() },
     )
   }
   else {
-    ElMessage.warning('该文件已经存在')
-    regulationVerification.value.splice(listIndex.value, 1)
+    ElMessage.warning('该文件已存在')
+    fetchregulationVerification()
+    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
@@ -496,14 +526,14 @@
 
 <template>
   <app-container>
-    <detail-page :title="`标准装置${textMap[pageType]}`">
+    <detail-page :title="`标准装置--${textMap[pageType]}`">
       <template #btns>
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
           @click="submitForm()"
         >
-          提交
+          保存
         </el-button>
         <el-button v-else v-print="printObj" type="primary">
           打印
@@ -517,13 +547,11 @@
         ref="baseInfoRef"
         :info-id="infoId"
         :button-type="pageType"
-        @setData="setData"
+        @set-data="setData"
       />
     </detail-page>
-    <detail-block-switch
-      v-if="pageType === 'detail' || pageType === 'edit'"
-      :title="pageType === 'detail' ? '' : current"
-    >
+    <!-- 表格区域 -->
+    <detail-block-switch :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button
@@ -558,8 +586,8 @@
         :columns="measurementPersonnelColumns"
         :list="measurementPersonnel"
         :loading="measurementPersonnelLoading"
-        @selectPerson="selectPerson"
-        @handleSelectionChange="handleSelectionChange"
+        @select-person="selectPerson"
+        @handle-selection-change="handleSelectionChange"
         @change-page="fetchmeasurementPersonnel"
       />
       <template-table
@@ -569,9 +597,9 @@
         :columns="corollaryEquipmentColumns"
         :list="corollaryEquipment"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchcorollaryEquipment"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '检定规程'"
@@ -580,9 +608,9 @@
         :columns="regulationVerificationColumns"
         :list="regulationVerification"
         :loading="corollaryEquipmentLoading"
-        @selectPerson="selectPerson"
+        @select-person="selectPerson"
         @change-page="fetchregulationVerification"
-        @handleSelectionChange="handleSelectionChange"
+        @handle-selection-change="handleSelectionChange"
       />
       <template-table
         v-if="current === '重复性考核记录'"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index bd8af61..e2c869b 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,7 +1,9 @@
+<!-- 标准装置列表 -->
 <script lang="ts" setup name="standardList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
@@ -34,6 +36,7 @@
     text: '标准代码',
     value: 'standardNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '标准名称',
@@ -74,7 +77,7 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '180',
+    width: '120',
     align: 'center',
   },
   {
@@ -107,7 +110,12 @@
   listQuery.value.preparationStartDate = preparationDate.value[0] || ''
   listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        preparationDate: item.preparationDate ? dayjs(item.preparationDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -165,6 +173,7 @@
     offset: 1, // 多少页
     limit: 20, // 一页多少条
   }
+  preparationDate.value = '' // 时间置空
   fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -180,7 +189,7 @@
 }
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 打印列表
 function printList() {
@@ -243,13 +252,9 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  standardName: string
-}
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (index: string, row: IStandardList) => {
   ElMessageBox.confirm(
     `确认删除${row.standardName}吗？`,
     '提示',
@@ -272,7 +277,7 @@
     })
 }
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IStandardList, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
 </script>
@@ -336,9 +341,9 @@
         >
           <el-option
             v-for="item in standardUsersDeptList"
-            :key="item.id"
+            :key="item.deptId"
             :label="item.organizeName"
-            :value="item.id"
+            :value="item.deptId"
           />
         </el-select>
       </search-item>
@@ -364,8 +369,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="180">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/standard/list/edit')"
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 11a7fe4..5f508e9 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -176,7 +176,8 @@
 export interface corollaryEquipmentType {
   name: string
   standardEquipmentId: string
-  equipmentId?: string
+  equipmentId?: string // 设备id
+  equipmentNo?: string // 设备编号
   id?: string
   equipmentName: string
 }
@@ -187,6 +188,7 @@
   standardEquipmentId: string
   verifyRegulationId?: string
   fileName: string
+  fileNo?: string // 文件号
   id?: string
 }
 
diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue
index ab7ef87..b2e752f 100644
--- a/src/views/measure/person/components/personListDialog.vue
+++ b/src/views/measure/person/components/personListDialog.vue
@@ -1,13 +1,13 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -32,7 +32,7 @@
   { text: '行政职务', value: 'administrationJob', align: 'center', width: '100' },
   { text: '计量专业', value: 'major', align: 'center', width: '100' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center', width: '120' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '180' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center', width: '100' },
 ])
 // 获取部门
@@ -54,8 +54,9 @@
   }
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.records.map((item: { sex: string | number }) => {
+      list.value = res.data.records.map((item: { sex: string | number; certificateDate: string }) => {
         item.sex = sexMap[item.sex as keyof typeof sexMap]
+        item.certificateDate = item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : ''
         return item
       })
       total.value = parseInt(res.data.total)
diff --git "a/\350\256\241\351\207\217.zip" "b/\350\256\241\351\207\217.zip"
new file mode 100644
index 0000000..521cb48
--- /dev/null
+++ "b/\350\256\241\351\207\217.zip"
Binary files differ