diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index a28d84b..a6442ca 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -9,7 +9,8 @@
     default: false,
   },
   columns: {
-    type: Array as PropType<TableColumn[]>,
+    // type: Array as PropType<TableColumn[]>,
+    type: Array as any,
     required: true,
   },
   list: {
@@ -69,7 +70,7 @@
         <span style="color: red;">*</span><span>{{ item.text }}</span>
       </template>
       <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
-        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+        <el-input v-model="scope.row.name" disabled placeholder="请选择" class="input">
           <template #append>
             <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
               选择

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index a28d84b..a6442ca 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -9,7 +9,8 @@
     default: false,
   },
   columns: {
-    type: Array as PropType<TableColumn[]>,
+    // type: Array as PropType<TableColumn[]>,
+    type: Array as any,
     required: true,
   },
   list: {
@@ -69,7 +70,7 @@
         <span style="color: red;">*</span><span>{{ item.text }}</span>
       </template>
       <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
-        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+        <el-input v-model="scope.row.name" disabled placeholder="请选择" class="input">
           <template #append>
             <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
               选择
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 6648992..b58ba0f 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import { id } from 'element-plus/es/locale'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -147,7 +148,7 @@
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
@@ -240,15 +241,7 @@
   certificateManagement.value = []
   certificateManagementLoading.value = false
 }
-// 编辑获取详情的提交按钮
-const submitFormUpdate = () => {
-  formInline.value.id = infoId.value
-  getStandardLisUpdate(formInline.value).then((res) => {
-    if (res.code === 200) {
-      close()
-    }
-  })
-}
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -258,39 +251,105 @@
   standard: '',
   extarCss: '',
 })
-// 提交
+// 点击保存
 const submitForm = () => {
-  if (pageType.value === 'edit') {
-    return submitFormUpdate()
+  const tempFormInline = baseInfoRef.value.formInline
+  tempFormInline.userList = [] // 计量人员
+  tempFormInline.equipmentList = [] // 配套设备
+  tempFormInline.verifyRegulationList = [] // 检定规程
+  // 处理计量人员数据
+  if (!measurementPersonnel.value.length) {
+    ElMessage.warning('计量人员表格不能为空')
+    return false
   }
-  baseInfoRef.value
-    .submitForm()
-    .validate()
-    .then(() => {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        getStandardListAdd(formInline.value).then((res) => {
+  else {
+    const tempArr = [] as any
+    measurementPersonnel.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          userId: item.id,
+        })
+      }
+    })
+    tempFormInline.userList = tempArr
+  }
+  // 处理标准配套设备数据
+  if (!corollaryEquipment.value.length) {
+    ElMessage.warning('标准配套设备表格不能为空')
+    return false
+  }
+  // 处理附件数据
+  if (tempFormInline.fileList.length) {
+    tempFormInline.fileList = tempFormInline.fileList.map((item: { minioFileName: string }) => {
+      return {
+        minioFileName: item.minioFileName,
+      }
+    })
+  }
+  else {
+    const tempArr = [] as any
+    corollaryEquipment.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          equipmentId: item.id,
+        })
+      }
+    })
+    tempFormInline.equipmentList = tempArr
+  }
+  // 处理检定规程数据
+  if (!regulationVerification.value.length) {
+    ElMessage.warning('检定规程表格不能为空')
+    return false
+  }
+  else {
+    const tempArr = [] as any
+    regulationVerification.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          verifyRegulationId: item.id,
+        })
+      }
+    })
+    tempFormInline.verifyRegulationList = tempArr
+  }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm('确认保存吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (pageType.value === 'add') { // 新建
+        getStandardListAdd(tempFormInline).then((res) => {
           if (res.code === 200) {
-            ElMessage.success('新增成功')
+            ElMessage.success('保存成功')
             close()
           }
         })
-      })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        getStandardLisUpdate(tempFormInline).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('保存成功')
+            close()
+          }
+        })
+      }
     })
+  })
 }
 const measurementPersonnelSelectionList = ref<object[]>([]) // 计量人员选中数组
 const corollaryEquipmentSelectionList = ref<object[]>([]) // 标准配套设备选中数组
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
-const listIndex = ref(0)
+const personIndex = ref(0) // 计量人员选中索引
+const equipmentIndex = ref(0) // 标准配套设备选中索引
+const fileIndex = ref(0) // 检定规程选中索引
 // 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
-    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name
+    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].id
   ) {
     ElMessage.warning('请先完善上一条计量人员信息')
   }
@@ -341,15 +400,15 @@
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
-    listIndex.value = index
+    personIndex.value = index
   }
   else if (text === '设备名称') {
     selectDeviceDialog.value.initDialog()
-    listIndex.value = index
+    equipmentIndex.value = index
   }
   else if (text === '文件名称') {
     verificationDialog.value.initDialog()
-    listIndex.value = index
+    fileIndex.value = index
   }
 }
 // 多选框选中
@@ -368,130 +427,72 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // 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()
-          }
-        })
-      })
+      measurementPersonnel.value = measurementPersonnel.value.filter(
+        item => !measurementPersonnelSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // corollaryEquipment.value = corollaryEquipment.value.filter(
-        //   item => !corollaryEquipmentSelectionList.value.includes(item),
-        // )
-        let ids = []
-        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
-        // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchcorollaryEquipment()
-          }
-        })
-      })
+      corollaryEquipment.value = corollaryEquipment.value.filter(
+        item => !corollaryEquipmentSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        let ids = []
-        ids = regulationVerification.value.map((item: any) => item.id)
-        delRegulationAdd({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchregulationVerification()
-          }
-        })
-      })
+      regulationVerification.value = regulationVerification.value.filter(
+        item => !regulationVerificationSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
 }
 // 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
+  console.log(measurementPersonnel.value)
+
   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()
-    })
+    console.log(index)
+
+    object.deptName = object.deptId
+    object.certificateDate = object.certificateDate ? dayjs(object.certificateDate).format('YYYY-MM-DD') : object.certificateDate
+    measurementPersonnel.value.splice(personIndex.value, 1, object)
   }
   else {
     ElMessage.warning('该人员已经存在')
-    fetchmeasurementPersonnel()
-    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
 // 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
   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) => {
-      fetchcorollaryEquipment()
-    })
+    data.name = data.equipmentName
+    data.validDate = data.validDate ? dayjs(data.validDate).format('YYYY-MM-DD') : data.validDate
+    corollaryEquipment.value.splice(equipmentIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该设备已存在')
-    // corollaryEquipment.value.splice(listIndex.value, 1)
-    fetchcorollaryEquipment()
   }
 }
 // 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
   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
-    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
-    regulationVerification.value[listIndex.value].name = data.fileName
-    delete data.id
-    getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => { fetchregulationVerification() },
-    )
+    data.name = data.fileName
+    regulationVerification.value.splice(fileIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该文件已存在')
-    fetchregulationVerification()
-    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index a28d84b..a6442ca 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -9,7 +9,8 @@
     default: false,
   },
   columns: {
-    type: Array as PropType<TableColumn[]>,
+    // type: Array as PropType<TableColumn[]>,
+    type: Array as any,
     required: true,
   },
   list: {
@@ -69,7 +70,7 @@
         <span style="color: red;">*</span><span>{{ item.text }}</span>
       </template>
       <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
-        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+        <el-input v-model="scope.row.name" disabled placeholder="请选择" class="input">
           <template #append>
             <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
               选择
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 6648992..b58ba0f 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import { id } from 'element-plus/es/locale'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -147,7 +148,7 @@
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
@@ -240,15 +241,7 @@
   certificateManagement.value = []
   certificateManagementLoading.value = false
 }
-// 编辑获取详情的提交按钮
-const submitFormUpdate = () => {
-  formInline.value.id = infoId.value
-  getStandardLisUpdate(formInline.value).then((res) => {
-    if (res.code === 200) {
-      close()
-    }
-  })
-}
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -258,39 +251,105 @@
   standard: '',
   extarCss: '',
 })
-// 提交
+// 点击保存
 const submitForm = () => {
-  if (pageType.value === 'edit') {
-    return submitFormUpdate()
+  const tempFormInline = baseInfoRef.value.formInline
+  tempFormInline.userList = [] // 计量人员
+  tempFormInline.equipmentList = [] // 配套设备
+  tempFormInline.verifyRegulationList = [] // 检定规程
+  // 处理计量人员数据
+  if (!measurementPersonnel.value.length) {
+    ElMessage.warning('计量人员表格不能为空')
+    return false
   }
-  baseInfoRef.value
-    .submitForm()
-    .validate()
-    .then(() => {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        getStandardListAdd(formInline.value).then((res) => {
+  else {
+    const tempArr = [] as any
+    measurementPersonnel.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          userId: item.id,
+        })
+      }
+    })
+    tempFormInline.userList = tempArr
+  }
+  // 处理标准配套设备数据
+  if (!corollaryEquipment.value.length) {
+    ElMessage.warning('标准配套设备表格不能为空')
+    return false
+  }
+  // 处理附件数据
+  if (tempFormInline.fileList.length) {
+    tempFormInline.fileList = tempFormInline.fileList.map((item: { minioFileName: string }) => {
+      return {
+        minioFileName: item.minioFileName,
+      }
+    })
+  }
+  else {
+    const tempArr = [] as any
+    corollaryEquipment.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          equipmentId: item.id,
+        })
+      }
+    })
+    tempFormInline.equipmentList = tempArr
+  }
+  // 处理检定规程数据
+  if (!regulationVerification.value.length) {
+    ElMessage.warning('检定规程表格不能为空')
+    return false
+  }
+  else {
+    const tempArr = [] as any
+    regulationVerification.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          verifyRegulationId: item.id,
+        })
+      }
+    })
+    tempFormInline.verifyRegulationList = tempArr
+  }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm('确认保存吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (pageType.value === 'add') { // 新建
+        getStandardListAdd(tempFormInline).then((res) => {
           if (res.code === 200) {
-            ElMessage.success('新增成功')
+            ElMessage.success('保存成功')
             close()
           }
         })
-      })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        getStandardLisUpdate(tempFormInline).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('保存成功')
+            close()
+          }
+        })
+      }
     })
+  })
 }
 const measurementPersonnelSelectionList = ref<object[]>([]) // 计量人员选中数组
 const corollaryEquipmentSelectionList = ref<object[]>([]) // 标准配套设备选中数组
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
-const listIndex = ref(0)
+const personIndex = ref(0) // 计量人员选中索引
+const equipmentIndex = ref(0) // 标准配套设备选中索引
+const fileIndex = ref(0) // 检定规程选中索引
 // 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
-    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name
+    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].id
   ) {
     ElMessage.warning('请先完善上一条计量人员信息')
   }
@@ -341,15 +400,15 @@
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
-    listIndex.value = index
+    personIndex.value = index
   }
   else if (text === '设备名称') {
     selectDeviceDialog.value.initDialog()
-    listIndex.value = index
+    equipmentIndex.value = index
   }
   else if (text === '文件名称') {
     verificationDialog.value.initDialog()
-    listIndex.value = index
+    fileIndex.value = index
   }
 }
 // 多选框选中
@@ -368,130 +427,72 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // 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()
-          }
-        })
-      })
+      measurementPersonnel.value = measurementPersonnel.value.filter(
+        item => !measurementPersonnelSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // corollaryEquipment.value = corollaryEquipment.value.filter(
-        //   item => !corollaryEquipmentSelectionList.value.includes(item),
-        // )
-        let ids = []
-        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
-        // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchcorollaryEquipment()
-          }
-        })
-      })
+      corollaryEquipment.value = corollaryEquipment.value.filter(
+        item => !corollaryEquipmentSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        let ids = []
-        ids = regulationVerification.value.map((item: any) => item.id)
-        delRegulationAdd({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchregulationVerification()
-          }
-        })
-      })
+      regulationVerification.value = regulationVerification.value.filter(
+        item => !regulationVerificationSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
 }
 // 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
+  console.log(measurementPersonnel.value)
+
   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()
-    })
+    console.log(index)
+
+    object.deptName = object.deptId
+    object.certificateDate = object.certificateDate ? dayjs(object.certificateDate).format('YYYY-MM-DD') : object.certificateDate
+    measurementPersonnel.value.splice(personIndex.value, 1, object)
   }
   else {
     ElMessage.warning('该人员已经存在')
-    fetchmeasurementPersonnel()
-    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
 // 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
   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) => {
-      fetchcorollaryEquipment()
-    })
+    data.name = data.equipmentName
+    data.validDate = data.validDate ? dayjs(data.validDate).format('YYYY-MM-DD') : data.validDate
+    corollaryEquipment.value.splice(equipmentIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该设备已存在')
-    // corollaryEquipment.value.splice(listIndex.value, 1)
-    fetchcorollaryEquipment()
   }
 }
 // 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
   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
-    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
-    regulationVerification.value[listIndex.value].name = data.fileName
-    delete data.id
-    getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => { fetchregulationVerification() },
-    )
+    data.name = data.fileName
+    regulationVerification.value.splice(fileIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该文件已存在')
-    fetchregulationVerification()
-    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 48f03f5..e7a7e25 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,7 +1,9 @@
-<script lang="ts" setup name="standardList">
+<!-- 到期提醒列表 -->
+<script lang="ts" setup name="ExpirationRemind">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -48,13 +50,13 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratory',
+    value: 'standardLaboratoryName',
     width: '120',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwnerName',
     align: 'center',
   },
   {
@@ -65,13 +67,13 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '160',
+    width: '120',
     align: 'center',
   },
   {
     text: '有效日期',
-    value: 'preparationDate',
-    width: '160',
+    value: 'validTime',
+    width: '120',
     align: 'center',
   },
 ])
@@ -104,7 +106,13 @@
     listQuery.value.offset = 1
   }
   getRemindListPage(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') : '',
+        validTime: item.validTime ? dayjs(item.validTime).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -345,19 +353,19 @@
         >
           <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>
       <search-item>
         <el-date-picker
           v-model="preparation"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -365,10 +373,10 @@
       <search-item>
         <el-date-picker
           v-model="validTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
@@ -383,8 +391,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="250">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index a28d84b..a6442ca 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -9,7 +9,8 @@
     default: false,
   },
   columns: {
-    type: Array as PropType<TableColumn[]>,
+    // type: Array as PropType<TableColumn[]>,
+    type: Array as any,
     required: true,
   },
   list: {
@@ -69,7 +70,7 @@
         <span style="color: red;">*</span><span>{{ item.text }}</span>
       </template>
       <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
-        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+        <el-input v-model="scope.row.name" disabled placeholder="请选择" class="input">
           <template #append>
             <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
               选择
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 6648992..b58ba0f 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import { id } from 'element-plus/es/locale'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -147,7 +148,7 @@
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
@@ -240,15 +241,7 @@
   certificateManagement.value = []
   certificateManagementLoading.value = false
 }
-// 编辑获取详情的提交按钮
-const submitFormUpdate = () => {
-  formInline.value.id = infoId.value
-  getStandardLisUpdate(formInline.value).then((res) => {
-    if (res.code === 200) {
-      close()
-    }
-  })
-}
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -258,39 +251,105 @@
   standard: '',
   extarCss: '',
 })
-// 提交
+// 点击保存
 const submitForm = () => {
-  if (pageType.value === 'edit') {
-    return submitFormUpdate()
+  const tempFormInline = baseInfoRef.value.formInline
+  tempFormInline.userList = [] // 计量人员
+  tempFormInline.equipmentList = [] // 配套设备
+  tempFormInline.verifyRegulationList = [] // 检定规程
+  // 处理计量人员数据
+  if (!measurementPersonnel.value.length) {
+    ElMessage.warning('计量人员表格不能为空')
+    return false
   }
-  baseInfoRef.value
-    .submitForm()
-    .validate()
-    .then(() => {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        getStandardListAdd(formInline.value).then((res) => {
+  else {
+    const tempArr = [] as any
+    measurementPersonnel.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          userId: item.id,
+        })
+      }
+    })
+    tempFormInline.userList = tempArr
+  }
+  // 处理标准配套设备数据
+  if (!corollaryEquipment.value.length) {
+    ElMessage.warning('标准配套设备表格不能为空')
+    return false
+  }
+  // 处理附件数据
+  if (tempFormInline.fileList.length) {
+    tempFormInline.fileList = tempFormInline.fileList.map((item: { minioFileName: string }) => {
+      return {
+        minioFileName: item.minioFileName,
+      }
+    })
+  }
+  else {
+    const tempArr = [] as any
+    corollaryEquipment.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          equipmentId: item.id,
+        })
+      }
+    })
+    tempFormInline.equipmentList = tempArr
+  }
+  // 处理检定规程数据
+  if (!regulationVerification.value.length) {
+    ElMessage.warning('检定规程表格不能为空')
+    return false
+  }
+  else {
+    const tempArr = [] as any
+    regulationVerification.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          verifyRegulationId: item.id,
+        })
+      }
+    })
+    tempFormInline.verifyRegulationList = tempArr
+  }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm('确认保存吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (pageType.value === 'add') { // 新建
+        getStandardListAdd(tempFormInline).then((res) => {
           if (res.code === 200) {
-            ElMessage.success('新增成功')
+            ElMessage.success('保存成功')
             close()
           }
         })
-      })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        getStandardLisUpdate(tempFormInline).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('保存成功')
+            close()
+          }
+        })
+      }
     })
+  })
 }
 const measurementPersonnelSelectionList = ref<object[]>([]) // 计量人员选中数组
 const corollaryEquipmentSelectionList = ref<object[]>([]) // 标准配套设备选中数组
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
-const listIndex = ref(0)
+const personIndex = ref(0) // 计量人员选中索引
+const equipmentIndex = ref(0) // 标准配套设备选中索引
+const fileIndex = ref(0) // 检定规程选中索引
 // 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
-    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name
+    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].id
   ) {
     ElMessage.warning('请先完善上一条计量人员信息')
   }
@@ -341,15 +400,15 @@
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
-    listIndex.value = index
+    personIndex.value = index
   }
   else if (text === '设备名称') {
     selectDeviceDialog.value.initDialog()
-    listIndex.value = index
+    equipmentIndex.value = index
   }
   else if (text === '文件名称') {
     verificationDialog.value.initDialog()
-    listIndex.value = index
+    fileIndex.value = index
   }
 }
 // 多选框选中
@@ -368,130 +427,72 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // 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()
-          }
-        })
-      })
+      measurementPersonnel.value = measurementPersonnel.value.filter(
+        item => !measurementPersonnelSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // corollaryEquipment.value = corollaryEquipment.value.filter(
-        //   item => !corollaryEquipmentSelectionList.value.includes(item),
-        // )
-        let ids = []
-        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
-        // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchcorollaryEquipment()
-          }
-        })
-      })
+      corollaryEquipment.value = corollaryEquipment.value.filter(
+        item => !corollaryEquipmentSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        let ids = []
-        ids = regulationVerification.value.map((item: any) => item.id)
-        delRegulationAdd({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchregulationVerification()
-          }
-        })
-      })
+      regulationVerification.value = regulationVerification.value.filter(
+        item => !regulationVerificationSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
 }
 // 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
+  console.log(measurementPersonnel.value)
+
   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()
-    })
+    console.log(index)
+
+    object.deptName = object.deptId
+    object.certificateDate = object.certificateDate ? dayjs(object.certificateDate).format('YYYY-MM-DD') : object.certificateDate
+    measurementPersonnel.value.splice(personIndex.value, 1, object)
   }
   else {
     ElMessage.warning('该人员已经存在')
-    fetchmeasurementPersonnel()
-    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
 // 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
   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) => {
-      fetchcorollaryEquipment()
-    })
+    data.name = data.equipmentName
+    data.validDate = data.validDate ? dayjs(data.validDate).format('YYYY-MM-DD') : data.validDate
+    corollaryEquipment.value.splice(equipmentIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该设备已存在')
-    // corollaryEquipment.value.splice(listIndex.value, 1)
-    fetchcorollaryEquipment()
   }
 }
 // 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
   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
-    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
-    regulationVerification.value[listIndex.value].name = data.fileName
-    delete data.id
-    getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => { fetchregulationVerification() },
-    )
+    data.name = data.fileName
+    regulationVerification.value.splice(fileIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该文件已存在')
-    fetchregulationVerification()
-    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 48f03f5..e7a7e25 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,7 +1,9 @@
-<script lang="ts" setup name="standardList">
+<!-- 到期提醒列表 -->
+<script lang="ts" setup name="ExpirationRemind">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -48,13 +50,13 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratory',
+    value: 'standardLaboratoryName',
     width: '120',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwnerName',
     align: 'center',
   },
   {
@@ -65,13 +67,13 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '160',
+    width: '120',
     align: 'center',
   },
   {
     text: '有效日期',
-    value: 'preparationDate',
-    width: '160',
+    value: 'validTime',
+    width: '120',
     align: 'center',
   },
 ])
@@ -104,7 +106,13 @@
     listQuery.value.offset = 1
   }
   getRemindListPage(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') : '',
+        validTime: item.validTime ? dayjs(item.validTime).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -345,19 +353,19 @@
         >
           <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>
       <search-item>
         <el-date-picker
           v-model="preparation"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -365,10 +373,10 @@
       <search-item>
         <el-date-picker
           v-model="validTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
@@ -383,8 +391,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="250">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e2c869b..57fd7a8 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -343,7 +343,7 @@
             v-for="item in standardUsersDeptList"
             :key="item.deptId"
             :label="item.organizeName"
-            :value="item.deptId"
+            :value="item.deptId!"
           />
         </el-select>
       </search-item>

diff --git a/src/components.d.ts b/src/components.d.ts
index b39b99c..90f2dde 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -63,6 +63,5 @@
     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/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index a2c536b..59a986f 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -195,11 +195,16 @@
       }
     })
     formInline.value = res.data
+    const tempArr = [] as any
+    if (res.data.fileList && res.data.fileList.length) {
+      res.data.fileList.forEach((item: { minioFileName: string }) => {
+        tempArr.push(item.minioFileName)
+      })
+    }
+    formInline.value.minioFileName = tempArr
   })
 }
-if (props.buttonType !== 'add') {
-  getInfo()
-}
+
 // 计量人员组件
 const personListdialog = ref()
 // 点击选择负责人函数
@@ -240,6 +245,13 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         formInline.value.minioFileName = res.data
+        const tempfileList = [] as any
+        res.data.forEach((item: string) => {
+          tempfileList.push({
+            minioFileName: item,
+          })
+        })
+        formInline.value.fileList = tempfileList
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -262,7 +274,12 @@
 const submitForm = () => {
   return ruleFormRef.value
 }
-defineExpose({ submitForm })
+defineExpose({ submitForm, formInline })
+onMounted(() => {
+  if (props.buttonType !== 'add') { // 编辑和详情获取详情信息
+    getInfo()
+  }
+})
 </script>
 
 <template>
@@ -352,7 +369,7 @@
               <el-input
                 v-model.trim="formInline.standardOwnerName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -472,7 +489,7 @@
               <el-input
                 v-model.trim="formInline.standardLaboratoryName"
                 :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               >
@@ -492,7 +509,7 @@
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
                 :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
-                :disabled="buttonType === 'detail'"
+                disabled
                 class="full-width-input"
                 clearable
               />
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
index 02db09a..21a15cb 100644
--- a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { listPageApi } from '@/api/device/standingBook'
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index a28d84b..a6442ca 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -9,7 +9,8 @@
     default: false,
   },
   columns: {
-    type: Array as PropType<TableColumn[]>,
+    // type: Array as PropType<TableColumn[]>,
+    type: Array as any,
     required: true,
   },
   list: {
@@ -69,7 +70,7 @@
         <span style="color: red;">*</span><span>{{ item.text }}</span>
       </template>
       <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
-        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+        <el-input v-model="scope.row.name" disabled placeholder="请选择" class="input">
           <template #append>
             <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
               选择
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 6648992..b58ba0f 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import { id } from 'element-plus/es/locale'
 import type {
   corollaryEquipmentType,
   measurementPersonnelType,
@@ -147,7 +148,7 @@
   { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '测量范围', value: 'mesureRange', align: 'center' },
-  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '检定时间', value: 'mesureDate', align: 'center', width: '180' },
   { text: '检定结果', value: 'mesureResult', align: 'center' },
   { text: '有效日期', value: 'validDate', align: 'center', width: '120' },
@@ -240,15 +241,7 @@
   certificateManagement.value = []
   certificateManagementLoading.value = false
 }
-// 编辑获取详情的提交按钮
-const submitFormUpdate = () => {
-  formInline.value.id = infoId.value
-  getStandardLisUpdate(formInline.value).then((res) => {
-    if (res.code === 200) {
-      close()
-    }
-  })
-}
+
 // 打印
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -258,39 +251,105 @@
   standard: '',
   extarCss: '',
 })
-// 提交
+// 点击保存
 const submitForm = () => {
-  if (pageType.value === 'edit') {
-    return submitFormUpdate()
+  const tempFormInline = baseInfoRef.value.formInline
+  tempFormInline.userList = [] // 计量人员
+  tempFormInline.equipmentList = [] // 配套设备
+  tempFormInline.verifyRegulationList = [] // 检定规程
+  // 处理计量人员数据
+  if (!measurementPersonnel.value.length) {
+    ElMessage.warning('计量人员表格不能为空')
+    return false
   }
-  baseInfoRef.value
-    .submitForm()
-    .validate()
-    .then(() => {
-      ElMessageBox.confirm('确认提交吗？', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        getStandardListAdd(formInline.value).then((res) => {
+  else {
+    const tempArr = [] as any
+    measurementPersonnel.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          userId: item.id,
+        })
+      }
+    })
+    tempFormInline.userList = tempArr
+  }
+  // 处理标准配套设备数据
+  if (!corollaryEquipment.value.length) {
+    ElMessage.warning('标准配套设备表格不能为空')
+    return false
+  }
+  // 处理附件数据
+  if (tempFormInline.fileList.length) {
+    tempFormInline.fileList = tempFormInline.fileList.map((item: { minioFileName: string }) => {
+      return {
+        minioFileName: item.minioFileName,
+      }
+    })
+  }
+  else {
+    const tempArr = [] as any
+    corollaryEquipment.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          equipmentId: item.id,
+        })
+      }
+    })
+    tempFormInline.equipmentList = tempArr
+  }
+  // 处理检定规程数据
+  if (!regulationVerification.value.length) {
+    ElMessage.warning('检定规程表格不能为空')
+    return false
+  }
+  else {
+    const tempArr = [] as any
+    regulationVerification.value.forEach((item) => {
+      if (item.id) {
+        tempArr.push({
+          verifyRegulationId: item.id,
+        })
+      }
+    })
+    tempFormInline.verifyRegulationList = tempArr
+  }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm('确认保存吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (pageType.value === 'add') { // 新建
+        getStandardListAdd(tempFormInline).then((res) => {
           if (res.code === 200) {
-            ElMessage.success('新增成功')
+            ElMessage.success('保存成功')
             close()
           }
         })
-      })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        getStandardLisUpdate(tempFormInline).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('保存成功')
+            close()
+          }
+        })
+      }
     })
+  })
 }
 const measurementPersonnelSelectionList = ref<object[]>([]) // 计量人员选中数组
 const corollaryEquipmentSelectionList = ref<object[]>([]) // 标准配套设备选中数组
 const regulationVerificationSelectionList = ref<object[]>([]) // 检定规程选中数组
 const userListRef = ref()
-const listIndex = ref(0)
+const personIndex = ref(0) // 计量人员选中索引
+const equipmentIndex = ref(0) // 标准配套设备选中索引
+const fileIndex = ref(0) // 检定规程选中索引
 // 计量人员--点击增加行
 const measurementPersonnelAddRow = () => {
   if (
     measurementPersonnel.value.length >= 1
-    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name
+    && !measurementPersonnel.value[measurementPersonnel.value.length - 1].id
   ) {
     ElMessage.warning('请先完善上一条计量人员信息')
   }
@@ -341,15 +400,15 @@
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
-    listIndex.value = index
+    personIndex.value = index
   }
   else if (text === '设备名称') {
     selectDeviceDialog.value.initDialog()
-    listIndex.value = index
+    equipmentIndex.value = index
   }
   else if (text === '文件名称') {
     verificationDialog.value.initDialog()
-    listIndex.value = index
+    fileIndex.value = index
   }
 }
 // 多选框选中
@@ -368,130 +427,72 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // 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()
-          }
-        })
-      })
+      measurementPersonnel.value = measurementPersonnel.value.filter(
+        item => !measurementPersonnelSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        // corollaryEquipment.value = corollaryEquipment.value.filter(
-        //   item => !corollaryEquipmentSelectionList.value.includes(item),
-        // )
-        let ids = []
-        ids = corollaryEquipmentSelectionList.value.map((item: any) => item.id)
-        // 发送请求删除标准配套设备
-        getEquipmentDelete({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchcorollaryEquipment()
-          }
-        })
-      })
+      corollaryEquipment.value = corollaryEquipment.value.filter(
+        item => !corollaryEquipmentSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      ElMessageBox.confirm(`确认删除选中的${title}列表吗？`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        let ids = []
-        ids = regulationVerification.value.map((item: any) => item.id)
-        delRegulationAdd({ ids }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('删除成功')
-            fetchregulationVerification()
-          }
-        })
-      })
+      regulationVerification.value = regulationVerification.value.filter(
+        item => !regulationVerificationSelectionList.value.includes(item),
+      )
     }
     else {
-      ElMessage.warning('请先选择中数据')
+      ElMessage.warning('请选中')
     }
   }
 }
 // 选择完计量人员
 const confirmPerson = (object: measurementPersonnelType) => {
+  console.log(measurementPersonnel.value)
+
   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()
-    })
+    console.log(index)
+
+    object.deptName = object.deptId
+    object.certificateDate = object.certificateDate ? dayjs(object.certificateDate).format('YYYY-MM-DD') : object.certificateDate
+    measurementPersonnel.value.splice(personIndex.value, 1, object)
   }
   else {
     ElMessage.warning('该人员已经存在')
-    fetchmeasurementPersonnel()
-    // measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
 // 选择完设备
 const selectDeviceList = (data: corollaryEquipmentType) => {
   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) => {
-      fetchcorollaryEquipment()
-    })
+    data.name = data.equipmentName
+    data.validDate = data.validDate ? dayjs(data.validDate).format('YYYY-MM-DD') : data.validDate
+    corollaryEquipment.value.splice(equipmentIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该设备已存在')
-    // corollaryEquipment.value.splice(listIndex.value, 1)
-    fetchcorollaryEquipment()
   }
 }
 // 检定规程选择完成
 const verificationList = (data: regulationVerificationType) => {
   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
-    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
-    regulationVerification.value[listIndex.value].name = data.fileName
-    delete data.id
-    getRegulationAdd(regulationVerification.value[listIndex.value]).then(
-      (res) => { fetchregulationVerification() },
-    )
+    data.name = data.fileName
+    regulationVerification.value.splice(fileIndex.value, 1, data)
   }
   else {
     ElMessage.warning('该文件已存在')
-    fetchregulationVerification()
-    // regulationVerification.value.splice(listIndex.value, 1)
   }
 }
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 48f03f5..e7a7e25 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,7 +1,9 @@
-<script lang="ts" setup name="standardList">
+<!-- 到期提醒列表 -->
+<script lang="ts" setup name="ExpirationRemind">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -48,13 +50,13 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratory',
+    value: 'standardLaboratoryName',
     width: '120',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'standardOwnerName',
+    value: 'laboratoryOwnerName',
     align: 'center',
   },
   {
@@ -65,13 +67,13 @@
   {
     text: '筹建日期',
     value: 'preparationDate',
-    width: '160',
+    width: '120',
     align: 'center',
   },
   {
     text: '有效日期',
-    value: 'preparationDate',
-    width: '160',
+    value: 'validTime',
+    width: '120',
     align: 'center',
   },
 ])
@@ -104,7 +106,13 @@
     listQuery.value.offset = 1
   }
   getRemindListPage(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') : '',
+        validTime: item.validTime ? dayjs(item.validTime).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
@@ -345,19 +353,19 @@
         >
           <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>
       <search-item>
         <el-date-picker
           v-model="preparation"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -365,10 +373,10 @@
       <search-item>
         <el-date-picker
           v-model="validTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
@@ -383,8 +391,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="250">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e2c869b..57fd7a8 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -343,7 +343,7 @@
             v-for="item in standardUsersDeptList"
             :key="item.deptId"
             :label="item.organizeName"
-            :value="item.deptId"
+            :value="item.deptId!"
           />
         </el-select>
       </search-item>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 5f508e9..689e86e 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -171,15 +171,19 @@
   standardEquipmentId: string
   id?: string
   userId?: string
+  deptName?: string // 工作部门名称
+  deptId?: string // 工作部门id
+  certificateDate?: string // 有效日期
 }
 // 标准配套设备数据类型
 export interface corollaryEquipmentType {
-  name: string
+  name?: string
   standardEquipmentId: string
   equipmentId?: string // 设备id
   equipmentNo?: string // 设备编号
   id?: string
-  equipmentName: string
+  equipmentName: string // 设备名称
+  validDate?: string // 有效期
 }
 
 // 检定规程数据类型