diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index a8222ac..0dcebfc 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,7 +161,6 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
@@ -169,6 +168,11 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
             <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />

diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index a8222ac..0dcebfc 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,7 +161,6 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
@@ -169,6 +168,11 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
             <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fbe1c47..fad76ab 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -122,8 +122,8 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
-          <template v-if="deptEdit" #append>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
         </el-input>

diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index a8222ac..0dcebfc 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -161,7 +161,6 @@
           :columns="columns"
           :query="listQuery"
           :list-loading="loadingTable"
-
           :pagination="false"
           size="small"
           @multi-select="handleSelectionChange"
@@ -169,6 +168,11 @@
           <!-- :is-showmulti-select="multi" -->
           <!-- :is-multi="multi" -->
           <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
             <el-table-column label="" width="40" align="center" fixed>
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index fbe1c47..fad76ab 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -122,8 +122,8 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit">
-          <template v-if="deptEdit" #append>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
             <el-button :icon="Aim" size="small" link @click="clickChoose" />
           </template>
         </el-input>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 4d35520..7504f9c 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -227,58 +227,45 @@
 }
 // 保存后的id
 const addId = ref('')
-// 提交、保存
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
   if (!formInline.value.equipmentInfoList.length) {
     ElMessage.warning('要求设备检修列表不能为空')
     return
   }
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        // 处理数据
+        if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+          formInline.value.equipmentList = formInline.value.equipmentInfoList.map((item: any) => {
+            return {
+              equipmentId: item.id,
+            }
+          })
+        }
+        else {
+          formInline.value.equipmentList = []
+        }
+        if (pageType.value === 'add') { // 新建
           addEquipmentApply(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
-            formInline.value.equipmentList = formInline.value.equipmentInfoList.map((item: any) => {
-              return {
-                equipmentId: item.id,
-              }
-            })
-          }
-          else {
-            formInline.value.equipmentList = []
-          }
+        }
+        else if (pageType.value === 'edit') { // 编辑
           if (from.value === 'reject') { // 未通过-驳回的编辑
             failUpdateEquipmentApply(formInline.value).then((res) => {
               if (res.code === 200) {
@@ -295,25 +282,23 @@
               }
             })
           }
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('已提交')
-          close()
         }
       })
     }
+  })
+}
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
   }
 }
 
@@ -323,29 +308,18 @@
   addRowRef.value.initDialog({ title: '' })
 }
 
-// 标准配套设备更换表格删除行
+// 删除行
 const removeRow = () => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
-      // 删除行
-      formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
-        return !SelectionList.value.includes(item)
-      })
-      // 删除给equipmentList重新赋值
-      formInline.value.equipmentList = []
-      formInline.value.equipmentInfoList.forEach((item: returnRowType, index: number) => {
-        formInline.value.equipmentList.push({ equipmentId: item.id })
-      })
-      ElMessage.success('删除成功')
+    // 删除行
+    formInline.value.equipmentInfoList = formInline.value.equipmentInfoList.filter((item) => {
+      return !SelectionList.value.includes(item)
     })
+    // 删除给equipmentList重新赋值
+    // formInline.value.equipmentList = []
+    // formInline.value.equipmentInfoList.forEach((item: returnRowType, index: number) => {
+    //   formInline.value.equipmentList.push({ equipmentId: item.id })
+    // })
   }
   else {
     ElMessage.warning('请先选择需要删除的数据')
@@ -358,13 +332,13 @@
 
 // 检修设备列表-选好设备了
 const confirmSelectDevice = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
+  row.forEach((item: returnRowType) => {
+    // 只添加列表里不存在的
+    const findIndex = formInline.value.equipmentInfoList.findIndex((i: any) => item.id === i.id)
+    if (findIndex === -1) {
+      formInline.value.equipmentInfoList.push(item)
+    }
   })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
 }
 
 // 选好申请人 userId用户id
@@ -453,13 +427,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭