diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f433559..13ebd99 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -38,7 +38,7 @@
   listQuery.value.trainStartTime = trainTime.value[0] || ''
   listQuery.value.trainEndTime = trainTime.value[1] || ''
   listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -199,7 +199,7 @@
           v-model="trainTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
@@ -210,10 +210,10 @@
           v-model="createTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="培训时间开始时间"
-          end-placeholder="培训时间结束时间"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
         />
       </search-item>
     </search-area>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f433559..13ebd99 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -38,7 +38,7 @@
   listQuery.value.trainStartTime = trainTime.value[0] || ''
   listQuery.value.trainEndTime = trainTime.value[1] || ''
   listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -199,7 +199,7 @@
           v-model="trainTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
@@ -210,10 +210,10 @@
           v-model="createTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="培训时间开始时间"
-          end-placeholder="培训时间结束时间"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 1911945..2237efd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -98,7 +98,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -106,7 +106,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f433559..13ebd99 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -38,7 +38,7 @@
   listQuery.value.trainStartTime = trainTime.value[0] || ''
   listQuery.value.trainEndTime = trainTime.value[1] || ''
   listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -199,7 +199,7 @@
           v-model="trainTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
@@ -210,10 +210,10 @@
           v-model="createTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="培训时间开始时间"
-          end-placeholder="培训时间结束时间"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 1911945..2237efd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -98,7 +98,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -106,7 +106,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c225b53..a13655d 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -137,7 +137,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -145,7 +145,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>

diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index 6afd53a..f12a3bd 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -107,6 +107,14 @@
     data,
   })
 }
+// 设备检修列表编辑-未通过-驳回编辑
+export function failUpdateEquipmentApply(data: object) {
+  return request({
+    url: '/equipmentApply/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单保存
 export function addAcceptanceCheck(data: object) {
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 9cbd57f..2490650 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -11,6 +11,13 @@
     default: () => [],
   },
   /**
+   * 是否显示详细地址
+   */
+  isShowDetailedAddress: {
+    type: Boolean,
+    default: true,
+  },
+  /**
    * 是否可编辑
    */
   disabled: {
@@ -160,7 +167,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
-      :disabled="detail"
+      :disabled="detail || !addressObj.country"
       class="address-select"
       @change="provinceChange"
     >
@@ -184,7 +191,7 @@
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
-      :disabled="detail"
+      :disabled="detail || !addressObj.province"
       class="address-select"
       @change="cityChange"
     >
@@ -209,7 +216,7 @@
       v-model="addressObj.area"
       placeholder="区/县"
       class="address-select"
-      :disabled="detail"
+      :disabled="detail || !addressObj.city"
       @change="areaChange"
     >
       <el-option
@@ -229,6 +236,7 @@
     />
     <!-- 详细地址 -->
     <el-input
+      v-if="isShowDetailedAddress"
       v-model="addressObj.address"
       :placeholder="detail ? '' : '详细地址'"
       :disabled="detail"
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/components/buttonBox/buttonBox.ts b/src/components/buttonBox/buttonBox.ts
index 96daa58..b339554 100644
--- a/src/components/buttonBox/buttonBox.ts
+++ b/src/components/buttonBox/buttonBox.ts
@@ -1,4 +1,5 @@
 export interface IMenu {
   name: string // 名字
-  id: string
+  id?: string
+  value?: string
 }
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 2fe1125..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,9 +410,9 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
-        component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
+        component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
           title: '设备检修列表',
           icon: 'ep:key',
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 2e90deb..f846c51 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -190,13 +190,13 @@
   myTestsPieTitle.value = 41
 }, 1)
 // 按钮跳转数据
-const buttomTypes = ref([
-  { id: '1', text: '证书打印', url: '/train/trainLog' },
-  { id: '2', text: '环境记录单', url: '/person/remind' },
-  { id: '3', text: '原始记录', url: '/source/list' },
-  { id: '4', text: '现场检测申请', url: '/measureDept/ks' },
-  { id: '5', text: '分包项目登记', url: '/measureDept/gcz' },
-  { id: '6', text: '分包方档案', url: '/person/list' },
+const buttonTypes = ref([
+  { id: '1', text: '证书打印', url: '/schedule/certPrintList' },
+  { id: '2', text: '环境记录单', url: '/lab/environmentalList' },
+  { id: '3', text: '原始记录', url: '/lab/primitiveLogList' },
+  { id: '4', text: '现场检测申请', url: '' },
+  { id: '5', text: '分包项目登记', url: '' },
+  { id: '6', text: '分包方档案', url: '' },
 ])
 // 当前进行中样品状态数据
 const statusData = ref([
@@ -205,6 +205,15 @@
   { name: '检测中', number: '135' },
   { name: '成编制报告', number: '135' },
 ])
+const router = useRouter()
+
+// 点击按钮组
+const handleClickButton = (id: string) => {
+  const index = buttonTypes.value.findIndex(item => item.id === id)
+  if (index !== -1 && buttonTypes.value[index].url) {
+    router.push(buttonTypes.value[index].url)
+  }
+}
 
 function calcBlockSize() {
   // 计算工作台区域高度 - 顶部-面包屑-边距
@@ -222,7 +231,6 @@
         <bench-col
           icon="icon-file"
           title="样品监控"
-          path-url="1"
           :height="blockHeight"
         >
           <el-table
@@ -290,9 +298,10 @@
         <bench-col :height="blockHeight - 180">
           <div class="bench-right-top">
             <div
-              v-for="item of buttomTypes"
+              v-for="item of buttonTypes"
               :key="item.text"
               class="right-top-box"
+              @click="handleClickButton(item.id)"
             >
               {{ item.text }}
             </div>
@@ -352,7 +361,6 @@
         <bench-col
           icon="icon-book"
           title="实时工作统计"
-          path-url="1"
           :style="{ height: blockHeight }"
           :height="blockHeight"
         >
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 824572f..9d9e488 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -399,7 +399,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -503,7 +503,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
@@ -564,7 +564,7 @@
               type="datetime"
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
@@ -599,7 +599,7 @@
               type="datetime"
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss"
               value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index bbaae75..b2ef7cf 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -147,6 +147,7 @@
       message: '请选中',
       type: 'warning',
     })
+    return
   }
   // 将选择好的样品传给父组件
   emits('confirmCheckout', checkoutList.value)
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 37bfead..b6f79f9 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -245,7 +245,7 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index d440968..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,15 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
+}
+// 标准配套设备表头类型
+export interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: boolean
+  width?: string
 }
 // 下拉框类型
 export interface IOptions {
@@ -142,3 +150,20 @@
 export interface IManageChecklist {
   id: string
 }
+export interface IButton {
+  name: string // 按钮名称
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  proxy?: string // 权限
+  show?: Function // 是否显示
+}
+export interface menuType {
+  name: string
+  value: string
+}
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index bf45d1e..a236a10 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -59,6 +59,7 @@
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '验收单名称',
@@ -84,6 +85,7 @@
     text: '检修日期',
     value: 'createTime',
     align: 'center',
+    width: '120',
   },
   {
     text: '审批状态',
@@ -96,12 +98,6 @@
 const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
 // 装载时间数组
 const checkTime = ref<string>('')
 // 点击按钮
@@ -183,9 +179,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -383,7 +377,7 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
@@ -398,10 +392,10 @@
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index e55e8bc..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,3 +1,4 @@
+<!-- 设备检修列表 -->
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
@@ -10,27 +11,40 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
-    default: '',
+    default: '0',
   },
   buttons: {
     type: Array as PropType<IButton[]>,
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
-
 // 获取权限
 const { proxy } = getCurrentInstance() as any
-
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
   approvalStatus: props.status, // 审批状态
@@ -55,14 +69,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
     align: 'center',
+    width: '160',
   },
   {
     text: '检修申请名称',
@@ -83,17 +96,18 @@
     text: '检修时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'remark',
-    align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
   },
+  {
+    text: '备注',
+    value: 'remark',
+    align: 'center',
+  },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -102,6 +116,7 @@
 // 装载时间数组
 const checkTime = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.startTime = checkTime.value[0] || ''
   listQuery.value.endTime = checkTime.value[1] || ''
@@ -123,14 +138,9 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-}
+
 const buttonTypeMap = ref('')
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -156,8 +166,8 @@
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -167,27 +177,20 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
-
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -238,9 +241,15 @@
   }
   fetchData(true)
 }
+// 驳回后编辑
+const editAgain = (row: IlistApproval) => {
+  $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`)
+}
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -272,18 +281,11 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -323,10 +325,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -347,6 +346,21 @@
     ElMessage.warning('无可打印内容')
   }
 }
+onMounted(async () => {
+  console.log(sessionStorage.getItem('maintenceListApprovalStatus'))
+
+  // await getDict()
+  // if (sessionStorage.getItem('maintenceListApprovalStatus')) {
+  //   listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')!
+  //   console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!])
+  // }
+  // else {
+  //   console.log('没有')
+
+  //   listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  // }
+  // fetchData(true)
+})
 </script>
 
 <template>
@@ -358,28 +372,14 @@
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyNo"
-          placeholder="申请编号"
+          placeholder="检修申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
           v-model.trim="listQuery.checkApplyName"
-          placeholder="申请名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyNo"
-          placeholder="设备编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.applyName"
-          placeholder="设备名称"
+          placeholder="检修申请名称"
           clearable
         />
       </search-item>
@@ -388,25 +388,32 @@
           v-model="checkTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="申请日期开始时间"
-          end-placeholder="申请日期结束时间"
+          start-placeholder="检修开始时间"
+          end-placeholder="检修结束时间"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -417,7 +424,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
@@ -427,7 +434,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
@@ -437,7 +444,7 @@
                 驳回
               </el-button>
               <el-button
-                v-if="status === '' || status === '2'"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
@@ -447,7 +454,7 @@
                 拒绝
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -456,7 +463,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -466,7 +473,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="status === '' || status === '3'"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -477,7 +484,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="status !== '4' && status !== '5'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
deleted file mode 100644
index 1842e6e..0000000
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<script lang="ts" setup name="maintenanceAdd">
-import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance } from 'element-plus'
-import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
-import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-import { getUserList } from '@/api/system/user'
-import type { deptType } from '@/views/device/standingBook/standingBook-interface'
-import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import addRow from '@/views/device/stateManage/components/addRow.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const ruleFormRef = ref<FormInstance>()
-const useDeptList = ref<deptType[]>([]) // 使用部门列表
-const usePersonList = ref<userType[]>([]) // 使用人列表
-// 逻辑代码
-const formInline = ref<IlistPageAddTypes>({
-  acceptanceCheckId: '', // 检修申请id
-  applyDesc: '', // 申请说明
-  applyName: '', // 申请名称
-  applyNo: '', // 申请编号
-  applyPerson: '', // 申请人
-  applyPersonName: '', // 申请人姓名
-  applyType: '8', // 申请类型
-  applyTypeName: '', // 申请类型名称
-  applyUnit: '', // 申请单位
-  applyUnitName: '', // 申请单位名称
-  approvalStatus: '', // 审批状态
-  approvalStatusName: '', // 审批状态名称
-  createTime: '', // 创建时间
-  createUser: '', // 创建人
-  equipmentInfoList: [], // 设备详情列表
-  equipmentList: [], // 设备列表
-  id: '', // 主键
-  isDel: '', // 删除id
-  overhaulPerson: '',
-  processId: '', // 审批id
-  processResult: '',
-  remark: '', // 备注
-  taskId: '', // 任务id
-  time: '',
-  updateTime: '', // 更新时间
-  version: '', // 版本号
-})
-// 审批弹窗信息收集类型
-interface ListType {
-  equipmentName: string
-  equipmentNo: string
-  modelNo: string
-  mesureRange: string
-  useDeptName: string
-  usePersonName: string
-  managerStateName: string
-  validDate: string
-  equipmentSpecifications: string
-  manufacturingNo: string
-  manufacturer: string
-}
-// 数据
-const list = ref<ListType[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: boolean
-  width?: string
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '测量范围',
-    value: 'mesureRange',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用部门',
-    value: 'useDeptName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-    required: true,
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-    required: true,
-    width: '160px',
-  },
-])
-// 标准配套设备更换查询条件
-const listQuery = ref<object>({
-  limit: 10,
-  offset: 1,
-})
-// 标准配套设备更换表格loding
-const loadingTable = ref(false)
-// 标准配套设备更换表格分页
-const changePage = () => {}
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-// 表单验证规则
-const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
-})
-// 获取部门列表
-getDeptTreeList().then((res) => {
-  // 转成树结构
-  useDeptList.value = toTreeList(res.data, '0', true)
-})
-// 获取用户列表
-getUserList({ offset: 1, limit: 99999 }).then((res) => {
-  usePersonList.value = res.data.rows
-})
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-    })
-}
-const approvalDialog = ref()
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', formInline.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', formInline.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
-  }
-}
-// 获取详情信息
-const getInfo = () => {
-  equipmentApplyInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
-    formInline.value = res.data
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          // formInline.equipmentInfoList
-          addEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateEquipmentApply(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitEquipmentApply({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
-        }
-      })
-    }
-  }
-  else {
-    clickBtn(item)
-  }
-}
-
-const addRowRef = ref()
-// 点击增加行
-const addRoow = () => {
-  // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  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('删除成功')
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
-// 表格多选框
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-
-// 设备列表添加
-const addRowMethods = (row: returnRowType[]) => {
-  row = [...formInline.value.equipmentInfoList, ...row]
-  formInline.value.equipmentList = []
-  row.forEach((item: returnRowType, index: number) => {
-    formInline.value.equipmentList.push({ equipmentId: item.id })
-  })
-  // 设备状态
-  formInline.value.equipmentInfoList = row
-}
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
-  }
-  applyListClose()
-}
-onMounted(async () => {
-  formInline.value.processId = $route.params.processId as string // 任务id
-})
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-</script>
-
-<template>
-  <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>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        label-position="right"
-        label-width="110px"
-        :rules="rules"
-      >
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="申请编号:">
-              <el-input
-                v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请名称:" prop="applyName">
-              <el-input
-                v-model.trim="formInline.applyName"
-                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请单位:" prop="applyUnit">
-              <dept-select
-                v-model="formInline.applyUnit"
-                :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="申请人:" prop="applyPerson">
-              <el-select
-                v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
-                :disabled="pageType === 'detail'"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="item in usePersonList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="检修时间:" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                type="datetime"
-                style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model.trim="formInline.remark"
-                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="检修设备列表">
-      <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.equipmentInfoList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="60" type="index" />
-        <el-table-column
-          v-for="(item, index) in columns"
-          :key="index"
-          align="center"
-          :label="item.text"
-          :width="item.width"
-          :prop="item.value"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
-    </detail-block>
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 借用设备列表 -->
-    <add-row ref="addRowRef" @add="addRowMethods" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  margin-top: 10px;
-  background-color: rgb(255 255 255);
-}
-
-.isDetail {
-  ::v-deep {
-    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
-    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
new file mode 100644
index 0000000..860d610
--- /dev/null
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -0,0 +1,620 @@
+<!-- 设备检修列表新增、编辑、详情 -->
+<script lang="ts" setup name="maintenanceDetail">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IlistPageAddTypes, columnsType, returnRowType } from '../checkList_interface'
+import { addEquipmentApply, equipmentApplyInfo, failUpdateEquipmentApply, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import type { userType } from '@/views/system/user/user-interface'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import addRow from '@/views/device/stateManage/components/selectDevice.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
+const infoId = ref('') // id
+const from = ref('') // reject代表未通过-驳回
+const buttonArray = ref<string[]>([])
+const pageType = ref('add') // 页面类型: add,edit, detail
+const textMap: { [key: string]: string } = {
+  add: '新建',
+  edit: '编辑',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+// 表单验证规则
+const rules = ref({
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+})
+
+const ruleFormRef = ref<FormInstance>()
+const useDeptList = ref<deptType[]>([]) // 使用部门列表
+const usePersonList = ref<userType[]>([]) // 使用人列表
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false)
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  overhaulPerson: '',
+  processId: '', // 审批id
+  processResult: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
+  time: '',
+  updateTime: '', // 更新时间
+  version: '', // 版本号
+})
+
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集
+const applyList = ref({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+
+// 检修设备列表表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160px',
+    required: true,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '测量范围',
+    value: 'mesureRange',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用部门',
+    value: 'useDeptName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+    required: true,
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    width: '120px',
+  },
+])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// -------------------------路由参数------------------------------------
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else
+  if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['提交', '保存']
+  }
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+if ($route.query && $route.query.from) {
+  from.value = $route.query.from as string
+}
+// -------------------------------------------------------------------------
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 取消
+const handleCancel = () => {
+  const params = {
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+    })
+  })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', formInline.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', formInline.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', formInline.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 获取详情信息
+const getInfo = () => {
+  equipmentApplyInfo({ id: infoId.value }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+    formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: any) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+      }
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo()
+}
+// 保存后的id
+const addId = ref('')
+// 提交、保存
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) { return }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm(
+          '确认保存吗？',
+          '提示',
+          {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning',
+          },
+        ).then(() => {
+          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,
+              }
+            })
+          }
+          if (from.value === 'reject') { // 未通过-驳回的编辑
+            failUpdateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else {
+            updateEquipmentApply(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+        })
+      }
+    })
+  }
+  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()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+
+const addRowRef = ref()
+// 点击批量增加
+const batchIncrease = () => {
+  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('删除成功')
+    })
+  }
+  else {
+    ElMessage.warning('请先选择需要删除的数据')
+  }
+}
+// 表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+
+// 检修设备列表-选好设备了
+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 })
+  })
+  // 设备状态
+  formInline.value.equipmentInfoList = row
+}
+
+// 选好申请人 userId用户id
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  // dataForm.value.reciever = name
+}
+// 选择器模糊查询--申请人
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 获取部门列表
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res) => {
+  // 转成树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取用户列表
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+onMounted(async () => {
+  await fetchUserList()
+  await fetchDeptTreeList()
+  formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
+})
+</script>
+
+<template>
+  <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>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="110px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model.trim="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:" prop="applyName">
+              <el-input
+                v-model.trim="formInline.applyName"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:" prop="applyUnit">
+              <dept-select
+                v-model="formInline.applyUnit"
+                :data="useDeptList"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:" prop="applyPerson">
+              <el-select
+                v-model="formInline.applyPerson"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
+                :disabled="pageType === 'detail'"
+                style="width: 100%;"
+                filterable
+                remote
+                remote-show-suffix
+                :remote-method="remoteMethod"
+                :loading="applyPersonLoading"
+                @change="changeSelectReceiver"
+              >
+                <el-option
+                  v-for="item in usePersonOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检修时间:" prop="time">
+              <el-date-picker
+                v-model="formInline.time"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="检修设备列表">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="batchIncrease">
+          批量增加
+        </el-button>
+        <!-- <el-button type="primary" @click="addRoow">
+          增加行
+        </el-button> -->
+        <el-button type="info" @click="removeRow">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="formInline.equipmentInfoList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column align="center" label="序号" width="60" type="index" />
+        <el-table-column
+          v-for="(item, index) in columns"
+          :key="index"
+          align="center"
+          :label="item.text"
+          :width="item.width"
+          :prop="item.value"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 借用设备列表 -->
+    <add-row ref="addRowRef" @add="confirmSelectDevice" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 5px;
+  width: 100%;
+  height: 6vh;
+  margin-top: 10px;
+  background-color: rgb(255 255 255);
+}
+
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1b9ed05..bc8fe9d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup name="manageAdd">
-/**
- * 添加/编辑/详情溯源供方
- */
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 56c7c1b..dc748fb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -1,73 +1,59 @@
-<script lang="ts" setup name="approve">
-import ListApproval from './components/listMaintenanceApproval.vue' // 全部
-import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
-const dictStore = useDictStore()
+<!-- 设备检修列表 -->
+<script lang="ts" setup name="MaintenanceList">
+import listMaintenanceApproval from './components/listMaintenanceApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
-const currentApprovalStatus = ref('')
+const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -76,7 +62,30 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
 
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+getDict()
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('maintenceListMenu', currentTab.value)
@@ -88,7 +97,7 @@
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
@@ -104,7 +113,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
+    <list-maintenance-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -114,7 +123,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 2ebb393..48f03f5 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -356,7 +356,7 @@
           v-model="preparation"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
@@ -367,7 +367,7 @@
           v-model="validTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
diff --git a/src/views/device/stateManage/components/addRow.vue b/src/views/device/stateManage/components/addRow.vue
deleted file mode 100644
index 83a85a6..0000000
--- a/src/views/device/stateManage/components/addRow.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import { listPageApi } from '@/api/device/standingBook'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  equipmentName: '', // 设备名称
-  equipmentNo: '', // 设备编号
-  limit: 10,
-  offset: 1,
-})
-const loadingTable = ref<boolean>(false)
-const list = ref([]) // 表格数据
-const total = ref<number>(0)
-const columns = ref([
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'modelNo',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'manufacturingNo',
-    align: 'center',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-    align: 'center',
-  },
-  {
-    text: '使用人',
-    value: 'usePersonName',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'validDate',
-    align: 'center',
-  },
-])
-// 获取数据列表
-const fetchData = () => {
-  loadingTable.value = true
-  listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, checked: '' }))
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-// 重置
-const reset = () => {
-  listQuery.value = {
-    equipmentName: '', // 姓名
-    equipmentNo: '', // 所在部门
-    limit: 10,
-    offset: 1,
-  }
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  const checkedArr = list.value.filter(item => item.checked !== '')
-  if (checkedArr.length) {
-    console.log(checkedArr, '选中的设备')
-    emits('add', checkedArr)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-checkbox v-model="scope.row.checked" :label="scope.$index" size="large" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-checkbox__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
new file mode 100644
index 0000000..6edc12a
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -0,0 +1,180 @@
+<!-- 设备列表弹窗 -->
+<script lang="ts" setup name="AddRow">
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  limit: 10,
+  offset: 1,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const columns = ref<TableColumn[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    width: '160',
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+  },
+  {
+    text: '出厂编号',
+    value: 'manufacturingNo',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  },
+  {
+    text: '使用人',
+    value: 'usePersonName',
+    align: 'center',
+  },
+  {
+    text: '有效日期',
+    value: 'validDate',
+    align: 'center',
+    width: '120',
+
+  },
+])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value as any).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: any) => {
+        return {
+          ...item,
+          checked: '',
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 姓名
+    equipmentNo: '', // 所在部门
+    limit: 10,
+    offset: 1,
+  }
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+    return
+  }
+  // 将选择好的样品传给父组件
+  emits('add', checkoutList.value)
+  dialogFormVisible.value = false
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select
+        @change="changePage"
+        @multi-select="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>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index 8f9aeb4..6f98013 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import addRow from './addRow.vue'
+import addRow from './selectDevice.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 94e3793..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -13,8 +13,10 @@
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
   priceNo: '', // 价格编号
-  priceType: '', // 类别
+  priceType: '', // 类别id
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
@@ -23,19 +25,17 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns: Ref<TableColumn[]> = ref([])
-columns.value = [
-  { text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
+const columns = ref<TableColumn[]>([{ text: '价格编号', value: 'priceNo', width: '140', align: 'center' },
   { text: '价格名称', value: 'priceName', align: 'center' },
   { text: '检校类型', value: 'checkType', align: 'center' },
-  { text: '类别', value: 'priceType', align: 'center' },
-  { text: '项目', value: 'priceItem', align: 'center' },
+  { text: '类别', value: 'categoryName', align: 'center' },
+  { text: '项目', value: 'itemName', align: 'center' },
   { text: '标准价格（元)', value: 'price', width: '120', align: 'center' },
   { text: '业务员折扣权限', value: 'operatorDiscountPermission', width: '125', align: 'center' },
   { text: '负责人折扣权限', value: 'directorDiscountPermission', width: '125', align: 'center' },
   { text: '依据标准', value: 'priceStandard', width: '90', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '170', align: 'center' },
-]
+])
 
 // 选中的内容
 const checkoutList = ref<string[]>([])
@@ -45,10 +45,8 @@
 const deleteId = ref('')
 // 校验类型下拉框数组
 const checkTypeOptions = ref<optionsType[]>([])
-// 类别下拉框数组
-const priceTypeOptions = ref<optionsType[]>([])
-// 项目下拉框数组
-const priceItemOptions = ref<optionsType[]>([])
+const operatorDiscountPermissionMap = ref<optionsType[]>([]) // 业务折扣权限
+const directorDiscountPermissionMap = ref<optionsType[]>([]) // 负责人折扣权限
 
 // 列表加载状态
 const loadingTable = ref(false)
@@ -107,28 +105,28 @@
 // 获取下拉框数据
 const getOptions = (code: string) => {
   getTypeSelect(code).then((res) => {
-    if (code === 'checkType') {
+    if (code === 'checkType') { // 校验类型
       checkTypeOptions.value = res.data
     }
-    else if (code === 'priceType') {
-      priceTypeOptions.value = res.data
+    if (code === 'operatorDiscountPermission') { // 业务折扣权限
+      operatorDiscountPermissionMap.value = res.data
     }
-    else if (code === 'priceItem') {
-      priceItemOptions.value = res.data
+    if (code === 'directorDiscountPermission') { // 负责人折扣权限
+      directorDiscountPermissionMap.value = res.data
     }
   })
 }
 getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
 // 点击重置
 const clearList = () => {
   listQuery.value = {
     checkType: '', // 检校类型
     priceItem: '', // 项目
+    categoryName: '', // 类别名称
+    itemName: '', // 项目名称
     priceName: '', // 价格名称
     priceNo: '', // 价格编号
-    priceType: '', // 类别
+    priceType: '', // 类别id
     offset: 1, // 页码
     limit: 20, // 分页数量
   }
@@ -136,7 +134,7 @@
 }
 const { proxy } = getCurrentInstance() as any
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
@@ -206,10 +204,7 @@
 const add = () => {
   $router.push('/price/add')
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -263,39 +258,23 @@
             v-for="item in checkTypeOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.value"
+            :value="item.id"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceType"
+          placeholder="请输入类别名称"
           clearable
-          placeholder="类别"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceTypeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
       <search-item>
-        <el-select
+        <el-input
           v-model.trim="listQuery.priceItem"
+          placeholder="请输入项目名称"
           clearable
-          placeholder="项目"
-          size="default"
-        >
-          <el-option
-            v-for="item in priceItemOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
+        />
       </search-item>
     </search-area>
     <table-container>
@@ -309,10 +288,17 @@
       <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120">
+          <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/measure/price/edit')"
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 5e28d9f..1b08e30 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -5,6 +5,8 @@
   priceName: string // 价格名称
   priceNo: string // 价格编号
   priceType: string // 类别
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
   limit: number // 页码
   offset: number // 分页数量
 }
@@ -48,4 +50,6 @@
   priceType: string // 价格类别-字典value
   remark: string // 备注
   updateTime?: null | string // 更新时间
+  categoryName: string // 类别名称
+  itemName: string // 项目名称
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 828d6c2..8592140 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -1,3 +1,4 @@
+<!-- 价格列表详情 -->
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
@@ -46,6 +47,8 @@
   priceType: '', // 价格类别-字典value
   remark: '', // 备注
   updateTime: null, // 更新时间
+  categoryName: '', // 类别名称
+  itemName: '', // 项目名称
 }
 // 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
@@ -55,8 +58,8 @@
 const rules = reactive<FormRules>({
   priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
   checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  itemName: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
   priceStandardName: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
   price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
   operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
@@ -177,7 +180,7 @@
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
-          提交
+          保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
@@ -218,7 +221,7 @@
                 >
                   <el-option
                     v-for="item in checkTypeOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -226,9 +229,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="类别:" prop="priceType">
+              <el-form-item label="类别:" prop="categoryName">
                 <el-input
-                  v-model.trim="formInline.priceType"
+                  v-model.trim="formInline.categoryName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入类别'"
                   :disabled="pageType === 'detail'"
@@ -236,9 +239,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="项目:" prop="priceItem">
+              <el-form-item label="项目:" prop="itemName">
                 <el-input
-                  v-model.trim="formInline.priceItem"
+                  v-model.trim="formInline.itemName"
                   clearable
                   :placeholder="pageType === 'detail' ? '' : '请输入项目'"
                   :disabled="pageType === 'detail'"
@@ -303,7 +306,7 @@
                 >
                   <el-option
                     v-for="item in operatorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
@@ -323,7 +326,7 @@
                 >
                   <el-option
                     v-for="item in directorDiscountPermissionOptions"
-                    :key="item.id"
+                    :key="item.value"
                     :label="item.name"
                     :value="item.value"
                   />
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 44861c9..5e62137 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,30 +1,15 @@
+<!-- 溯源供方审批列表 -->
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
-import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
-import type { IButton } from './list_interface'
-import useDictStore from '@/store/modules/dict'
-import { getQueryPriceInfo } from '@/api/system/price'
-const dictStore = useDictStore()
-interface MenuType {
-  name: string
-  value: any
-}
-const menus = ref<MenuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+import type { IButton, dictType } from './list_interface'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 
+import { getDictByCode } from '@/api/system/dict'
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -43,10 +28,12 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
@@ -66,8 +53,9 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
+// 路由参数
 const $route = useRoute()
 if ($route.query && $route.query.type) {
   const currentMenu = menus.value.find(item => item.value == $route.query.type)
@@ -75,19 +63,41 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('sourceListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
   sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true, immediate: true })
 </script>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index c0be801..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -2,13 +2,15 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { IButton, ISupplier, IlistTypes, rowReturn, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval, submitApproval } from '@/api/approval'
+import type { IAddress } from '@/components/AddressSelect/address-interface'
+
 const props = defineProps({
   status: {
     type: String,
@@ -20,21 +22,31 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
+const companyAddress = ref<string[]>([]) // 公司地址
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  // 审批中状态时候长度返回错误
+  if (props.status === '3' || props.status === '6') {
+    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
+  }
+  return props.buttons.length * 40 + 23
 })
 
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
   businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
+  companyArea: '', // 区
+  companyCity: '', // 市
+  companyProvince: '', // 省
+  companyCountry: '', // 国家
+  companyAreaName: '', // 区
+  companyCityName: '', // 市
+  companyCountryName: '', // 国家
+  companyProvinceName: '', // 省
   formId: SCHEDULE.SUPPLIER_APPROVAL,
   supplierName: '',
   supplierNo: '',
@@ -47,8 +59,6 @@
 const list = ref<ISupplier[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '溯源供方编号', value: 'supplierNo', width: '160', align: 'center' },
@@ -63,18 +73,11 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -83,15 +86,11 @@
   }
   getapprovalListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
+    companyAddress.value = [response.data.rows[0].companyCountry, response.data.rows[0].companyProvince, response.data.rows[0].companyCity, response.data.rows[0].companyArea, response.data.rows[0].companyAddress]
     total.value = parseInt(response.data.total)
+    console.log(companyAddress.value)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -100,10 +99,16 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
+// 公司地址变化后给对象赋值
+function companyAddressChange(addressObj: IAddress) {
+  listQuery.value.companyCountry = addressObj.country
+  listQuery.value.companyProvince = addressObj.province
+  listQuery.value.companyCity = addressObj.city
+  listQuery.value.companyArea = addressObj.area
+  listQuery.value.companyCountryName = addressObj.countryName
+  listQuery.value.companyProvinceName = addressObj.provinceName
+  listQuery.value.companyCityName = addressObj.cityName
+  listQuery.value.companyAreaName = addressObj.areaName
 }
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
@@ -143,7 +148,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
       fetchData(true)
     })
@@ -162,9 +167,14 @@
   listQuery.value = {
     approvalStatus: props.status,
     businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
+    companyArea: '', // 区
+    companyCity: '', // 市
+    companyProvince: '', // 省
+    companyCountry: '', // 国家
+    companyAreaName: '', // 区
+    companyCityName: '', // 市
+    companyCountryName: '', // 国家
+    companyProvinceName: '', // 省
     formId: SCHEDULE.SUPPLIER_APPROVAL,
     supplierName: '',
     supplierNo: '',
@@ -209,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -224,10 +237,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
+
 // 提交
 const approvalSubmit = (row: ISupplier) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -285,11 +295,12 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
+    console.log('change status', newVal)
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
   { immediate: true })
+
 // 打印列表
 function printList() {
   // 打印列
@@ -333,47 +344,105 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
+          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
         </search-item>
       </search-area>
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
           <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="160">
+            <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="clickBtn(row, '查看')"
+                >
                   查看
                 </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
-                  编辑
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
-                  编辑
-                </el-button>
-                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
-                  提交
-                </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '同意')"
+                >
                   同意
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                  size="small"
+                  link
+                  type="primary"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '驳回')"
+                >
                   驳回
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '拒绝')"
+                >
                   拒绝
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                  size="small"
+                  link
+                  type="primary"
+                  @click="clickBtn(row, '提交')"
+                >
+                  提交
+                </el-button>
+                <!-- 是发起者且审批中可以取消 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                  size="small"
+                  link
+                  type="info"
+                  :disabled="row.approvalStatusName !== '审批中'"
+                  @click="clickBtn(row, '取消')"
+                >
                   取消
                 </el-button>
-                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 7b89b15..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -1,18 +1,25 @@
+<!-- 溯源供方审批详情 -->
 <script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
   approvalType.value = $route.params.type as string
+  console.log('approvalType', approvalType)
+
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -20,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -82,26 +93,18 @@
 const close = () => {
   $router.back()
 }
-
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -121,7 +124,7 @@
       type: 'warning',
     },
   ).then(() => {
-    cancelApproval(params).then((res) => {
+    cancelApproval(params).then(() => {
       ElMessage.success('取消成功')
     })
   })
@@ -144,11 +147,18 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
   <app-container>
-    <detail-page title="溯源供方审批">
+    <detail-page title="溯源供方审批-详情">
       <template #btns>
         <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
           同意
@@ -168,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -202,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 7cfd1ea..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -6,7 +6,6 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -151,9 +150,7 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -167,27 +164,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -294,13 +270,19 @@
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90">
+          <el-table-column label="操作" align="center" width="90" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index ac14afe..34b813b 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -40,7 +40,7 @@
   id: '',
   businessContent: '',
   supplierName: '',
-  supplierNo: '',
+  supplierNo: '', // 溯源供方编号
   bankAccount: '',
   bankAccountNumber: '',
   bankName: '',
@@ -296,11 +296,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -348,7 +343,7 @@
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
+        <el-button v-if="pageType === 'add'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
@@ -576,12 +571,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button type="primary" @click="addRow">
           增加行
         </el-button>
+        <el-button type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="traceSupplierPersonList"
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index d0ab9f2..60d4160 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,7 +1,8 @@
 export interface IlistQuery {
-  supplierNo: string // 业务内容
+  supplierNo: string // 溯源供方编号
   supplierName: string // 溯源供方名称
-  businessContent: string // 溯源供方编号
+  businessContent: string // 业务内容
+
   formId: string
   offset: number
   limit: number
@@ -46,7 +47,11 @@
   editable?: boolean // 是否可编辑
   [key: string]: any
 }
-
+// 点击删除和编辑的参数类型
+export interface rowReturn {
+  id: string
+  supplierName: string
+}
 export interface ISupplier {
   businessContent: string // 业务内容
   supplierName: string // 公司名称
@@ -98,9 +103,14 @@
 export interface IlistTypes {
   approvalStatus: string
   businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
+  companyArea: string // 区
+  companyCity: string // 市
+  companyProvince: string // 省
+  companyCountry: string // 国家
+  companyAreaName: string // 区
+  companyCityName: string // 市
+  companyCountryName: string // 国家
+  companyProvinceName: string // 省
   formId: string
   supplierName: string
   supplierNo: string
@@ -114,3 +124,10 @@
   proxy?: string // 权限
   show?: Function // 是否显示
 }
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 57e0f82..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -85,10 +84,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
-  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
-  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
-  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
+  console.log(trainTimeRange.value)
+  console.log('----', createTimeRange.value)
+
+  listQuery.value.createEndTime = createTimeRange.value[1] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[0] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[1] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[0] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -200,41 +202,6 @@
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listQuery.value.ids = []
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: props.status, // 审批状态
-      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-      createEndTime: listQuery.value.createEndTime, // 创建结束时间
-      createStartTime: listQuery.value.createStartTime, // 创建开始时间
-      deptId: listQuery.value.deptId, // 部门id
-      director: listQuery.value.director, // 负责人
-      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
-      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
-      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
-      offset: 1, // 当前页
-      limit: 20, // 每页多少条
-      ids: checkoutList.value,
-    }
-    // 调导出接口
-    exportPlanList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '培训计划列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -282,10 +249,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -419,13 +383,11 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- 审批的导出功能去掉 -->
-        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f433559..13ebd99 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -38,7 +38,7 @@
   listQuery.value.trainStartTime = trainTime.value[0] || ''
   listQuery.value.trainEndTime = trainTime.value[1] || ''
   listQuery.value.createStartTime = createTime.value[0] || ''
-  listQuery.value.createEndTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -199,7 +199,7 @@
           v-model="trainTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
@@ -210,10 +210,10 @@
           v-model="createTime"
           type="datetimerange"
           range-separator="到"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="培训时间开始时间"
-          end-placeholder="培训时间结束时间"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
         />
       </search-item>
     </search-area>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 1911945..2237efd 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -98,7 +98,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -106,7 +106,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c225b53..a13655d 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -137,7 +137,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -145,7 +145,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index b3c56f8..b1cb93d 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -122,7 +122,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -130,7 +130,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>