diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e7a7e25..052487c 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -377,8 +377,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="到期开始日期"
-          end-placeholder="到期结束日期"
+          start-placeholder="有效日期起始"
+          end-placeholder="有效日期结束"
         />
       </search-item>
     </search-area>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e7a7e25..052487c 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -377,8 +377,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="到期开始日期"
-          end-placeholder="到期结束日期"
+          start-placeholder="有效日期起始"
+          end-placeholder="有效日期结束"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 189fbdc..c49b84c 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="pauseApply">
+<!-- 暂停申请 -->
+<script lang="ts" setup name="PauseApply">
 import applyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e7a7e25..052487c 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -377,8 +377,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="到期开始日期"
-          end-placeholder="到期结束日期"
+          start-placeholder="有效日期起始"
+          end-placeholder="有效日期结束"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 189fbdc..c49b84c 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="pauseApply">
+<!-- 暂停申请 -->
+<script lang="ts" setup name="PauseApply">
 import applyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 689e86e..ed415e0 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -117,9 +117,17 @@
 }
 export interface IFixedAssetsList {
   id: string
+  validDate?: string // 有效日期
 }
 // 申请formInline类型
 export interface IformInline {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
   assessDate: string // 考核日期
   assessmentUnit: string // 考核单位
   category: string // 类 别
@@ -198,8 +206,14 @@
 
 // 申请FromListInfo类型
 export interface IFromListInfo {
-  applyDept: string // 申请部门
+  applyName: string // 申请名称
   applyNo: string // 申请编号
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyDept: string // 申请部门
   applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
   applyTypeName: string // 申请类型名称
   approvalStatus: string // 审批状态

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e7a7e25..052487c 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -377,8 +377,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="到期开始日期"
-          end-placeholder="到期结束日期"
+          start-placeholder="有效日期起始"
+          end-placeholder="有效日期结束"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 189fbdc..c49b84c 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="pauseApply">
+<!-- 暂停申请 -->
+<script lang="ts" setup name="PauseApply">
 import applyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 689e86e..ed415e0 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -117,9 +117,17 @@
 }
 export interface IFixedAssetsList {
   id: string
+  validDate?: string // 有效日期
 }
 // 申请formInline类型
 export interface IformInline {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
   assessDate: string // 考核日期
   assessmentUnit: string // 考核单位
   category: string // 类 别
@@ -198,8 +206,14 @@
 
 // 申请FromListInfo类型
 export interface IFromListInfo {
-  applyDept: string // 申请部门
+  applyName: string // 申请名称
   applyNo: string // 申请编号
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyDept: string // 申请部门
   applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
   applyTypeName: string // 申请类型名称
   approvalStatus: string // 审批状态
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 119af38..b9a50ef 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -870,18 +870,18 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="minioFileName">
-              <div style="display: flex;">
-                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
-                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">x</span>
-                </show-photo>
-              </div>
-              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
                 上传
               </el-button>
-              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+              <div style="display: flex;">
+                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">无</span>
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 3a8447f..63f09d2 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,7 +127,7 @@
   })
 }
 
-// 申请编辑
+// 申请编辑--草稿箱、已取消
 export function updateStandardEquipmentApply(data: object) {
   return request({
     url: '/standard/updateStandardEquipmentApply',
@@ -136,6 +136,15 @@
   })
 }
 
+// 申请编辑--未通过-驳回
+export function failUpdateStandardEquipmentApply(data: object) {
+  return request({
+    url: '/standard/failUpdate',
+    method: 'post',
+    data,
+  })
+}
+
 // 批量添加标准装置底部计量人员
 export function setBatchAdd(data: object) {
   return request({
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index 85dc752..eff72d0 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -171,7 +171,7 @@
   text-align: center;
   line-height: 20px;
   border-radius: 50%;
-  background: rgb(0 0 0 / 30%);
-  color: #fff;
+  background: #f5f7fa;
+  color: #bbabb2;
   cursor: pointer;
 }
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 510917f..35ae777 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -231,6 +231,9 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
+  console.log('oooooo')
+  console.log(row)
+
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -241,6 +244,9 @@
         type: 'warning',
       },
     ).then(() => {
+      console.log('-----------')
+
+      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index 3b8f274..5e7d1d8 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -205,6 +205,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -260,6 +261,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -294,6 +296,7 @@
                 :prop="item.value"
                 align="center"
                 :label="item.text"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 319f2c7..5b7e7c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -3,6 +3,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
@@ -11,10 +12,11 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-
+import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
 const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
+const user = useUserStore() // 用户信息
 const textMap: { [key: string]: string } = {
   add: '新建',
   edit: '编辑',
@@ -348,6 +350,8 @@
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.overhaulPerson = user.name
+  formInline.value.checkDate = dayjs().format('YYYY-MM-DD')
   // 编辑和详情页面获取详情信息
   if (pageType.value !== 'add') {
     getInfo() // 获取详情信息
@@ -385,7 +389,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -404,7 +408,7 @@
               <el-input
                 v-model="checkIdObject.applyNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -433,7 +437,7 @@
               <el-input
                 v-model.trim="formInline.overhaulPerson"
                 :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -496,7 +500,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="请选择计划编号"
+              placeholder="请选择检修结果"
               size="default"
               :disabled="pageType === 'detail'"
             >
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index 207db34..109e0a7 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -377,7 +377,7 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-device" title="标签识别" @click="execTag" />
+        <!-- <icon-button icon="icon-device" title="标签识别" @click="execTag" /> -->
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/receive/applyList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 37839c3..80c43cb 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="approve">
+<script lang="ts" setup name="ApplyList">
 import All from './listApply/all.vue' // 全部
 import DraftBox from './listApply/draftBox.vue' // 草稿箱
 import ApprovalPending from './listApply/approvalPending.vue'// 待审批
@@ -73,7 +73,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index b010f26..28adf40 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -1,12 +1,10 @@
 <!-- 全部 -->
-<script lang="ts" setup name="all">
+<script lang="ts" setup name="All">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
+  { name: '编辑', type: 'primary' },
   { name: '取消', type: 'info' },
   { name: '删除', type: 'danger' },
 ])
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index 2e80544..5abce0f 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -4,11 +4,7 @@
 import listPage from './listPage.vue'
 const buttons = ref([
   { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
   { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
 ])
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 9e49e4e..4b0f2c1 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="ListSource">
+<script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -8,7 +8,10 @@
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
 const props = defineProps({
   name: {
     type: String,
@@ -49,6 +52,8 @@
   limit: 20, // 一页多少条
   offset: 1, // 第几页
 })
+// 获取数据
+const useDeptList = ref([])
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
@@ -62,6 +67,7 @@
   {
     text: '申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -93,18 +99,19 @@
   },
   {
     text: '申请部门',
-    value: 'applyDept',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'createUser',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
     text: '申请时间',
-    value: 'createTime',
+    value: 'applyTime',
     align: 'center',
+    width: '180',
   },
   {
     text: '审批状态',
@@ -112,21 +119,14 @@
     align: 'center',
   },
 ])
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
+
 // 审批弹窗信息收集
-const applyList = ref<applyListType>({
+const applyList = ref({
   select: '',
   epilog: '',
   approval: '',
   approvalTime: '',
 })
-const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
 // 导出id类型
@@ -140,6 +140,12 @@
 // 审批弹窗开关
 const applyShow = ref(false)
 const loadingTable = ref(false)
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 23
+})
+
 // 获取部门信息参数
 const DeptParams = ref({
   createEndTime: '',
@@ -157,6 +163,12 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+// 获取使用部门
+getDeptTreeList().then((res) => {
+  if (res.data) { // 将列表转树结构
+    useDeptList.value = toTreeList(res.data, '0', true)
+  }
+})
 const fetchData = (isNowPage: boolean) => {
   loadingTable.value = true
   if (!isNowPage) {
@@ -181,7 +193,8 @@
   standardOwner: string
   createTime: string
   taskId: string
-  processId: string
+  processId: string // 流程实例id
+  approvalStatusName: string // 审批类型名称
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -220,6 +233,7 @@
       applyType: props.applyType,
       formId: props.schedule,
       processId: row.processId,
+      approvalStatusName: row.approvalStatusName,
     },
   })
 }
@@ -244,7 +258,7 @@
 // 取消
 const handleCancel = (row: rowReturn) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -257,7 +271,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -286,6 +300,8 @@
           id: row.id,
           applyType: props.applyType,
           formId: props.schedule,
+          processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -332,23 +348,7 @@
   }
   fetchData(true)
 }
-// 关闭编辑
-const close = () => {
-  show.value = true
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  getExportList(listQuery.value).then((res) => {
-    const blob = new Blob([res.data])
-    exportFile(blob, '标准装置申请列表.xlsx')
-  })
-  loading.close()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -379,10 +379,6 @@
     },
   })
 }
-// 导出
-const exportAll = () => {
-  exportExcelBtn()
-}
 
 // 打印列表
 function printList() {
@@ -412,15 +408,6 @@
   }
   handleClose()
 }
-
-const permUrl = {
-  edit: '/standard/changeApply/edit', // 编辑
-  agree: '/standard/changeApply/agree', // 同意
-  reject: '/standard/changeApply/reject', // 驳回
-  refuse: '/standard/changeApply/refuse', // 拒绝
-  cancel: '/standard/changeApply/cancel', // 取消
-  delete: '/standard/changeApply/delete', // 删除
-}
 </script>
 
 <template>
@@ -436,13 +423,13 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.equipmentNo"
           placeholder="设备编号"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
@@ -458,6 +445,9 @@
         />
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.applyUnit" :data="useDeptList" placeholder="申请部门" style="width: 185px;" />
+      </search-item>
+      <!-- <search-item>
         <el-select
           v-model.trim="listQuery.organizeNo"
           clearable
@@ -471,20 +461,26 @@
             :value="item.id"
           />
         </el-select>
-      </search-item>
+      </search-item> -->
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button 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="300">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -495,37 +491,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if(row, permUrl.agree)"
+                v-if="proxy.hasPerm('/standard/changeApply/agree') && row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.agree.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if(row, permUrl.reject)"
+                v-if="proxy.hasPerm('/standard/changeApply/reject') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="proxy.buttonPerm.reject.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.refuse.if(row, permUrl.refuse)"
+                v-if="proxy.hasPerm('/standard/changeApply/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="proxy.buttonPerm.refuse.disabled(row)"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if(row, permUrl.edit)"
+                v-if="proxy.hasPerm('/standard/changeApply/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -534,7 +530,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if(row)"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -544,21 +540,21 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.buttonPerm.cancel.if(row, permUrl.cancel)"
+                v-if="proxy.hasPerm('/standard/changeApply/cancel') && row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="proxy.buttonPerm.cancel.disabled(row)"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '取消')"
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="proxy.buttonPerm.delete.if(row, permUrl.delete)"
+                v-if="proxy.hasPerm('/standard/changeApply/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="clickBtn(row, '删除')"
               >
                 删除
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 7f48051..12e69ec 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,6 +1,7 @@
+<!-- 更换\暂停\撤销\恢复\复查详情 -->
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
@@ -10,6 +11,7 @@
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import {
+  failUpdateStandardEquipmentApply,
   getStandardLisAdd,
   getStandardLisdetali,
   getStandardListDetail,
@@ -20,7 +22,8 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { submitApproval } from '@/api/approval'
+import { fetchApproval, submitApproval } from '@/api/approval'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -29,31 +32,41 @@
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '查看',
+  detail: '详情',
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
-const { username } = useUserStore()
+const user = useUserStore() // 用户信息
+const addId = ref('') // 保存后的id，用于提交使用
+const approvalStatusName = ref('') // 审批状态名称
+// 表格选中的数组
+const selectionList = ref<object[]>([])
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   formId.value = $route.query.formId as string
-  if (pageType.value === 'add') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存']
-  }
-  else {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
+  // if (pageType.value === 'add') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['保存']
+  // }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
   if ($route.query.id) {
     infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref<IformInline>({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -64,6 +77,7 @@
   createTime: null, // 创建时间
   createUser: null, // 创建人
   id: '', // 主键id
+  processId: '', // 流程实例id
   laboratoryOwner: '', // 实验室
   laboratoryOwnerContact: '', // 实验室负责人
   laboratoryOwnerName: '', // 实验室名称
@@ -94,8 +108,14 @@
 })
 
 const fromListInfo = ref<IFromListInfo>({
-  applyDept: '', // 申请部门
   applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyTime: '', // 申请时间
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人名称
+  applyDept: '', // 申请部门
   applyType: $route.query.applyType, // 申请类型
   applyTypeName: '', // 申请类型名称
   approvalStatus: '', // 审批状态
@@ -158,6 +178,7 @@
 getSelectList('transmitRange') // 获取传递范围下拉框
 getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
+// 获取部门信息参数
 const params = ref({
   director: '',
   meterMajor: '',
@@ -218,6 +239,7 @@
   required: Boolean // 是否必填
   choose: Boolean // 是否有按钮
   time: Boolean // 是否是时间选择框
+  width?: string // 宽
 }
 
 // 标准配套设备更换表头
@@ -229,6 +251,7 @@
     required: true,
     choose: true,
     time: false,
+    width: '240',
   },
   {
     text: '设备编号',
@@ -256,7 +279,7 @@
   },
   {
     text: '使用部门',
-    value: 'useDept',
+    value: 'useDeptName',
     align: 'center',
     required: true,
     choose: false,
@@ -272,7 +295,7 @@
   },
   {
     text: '检定结果',
-    value: 'mesureResult',
+    value: 'mesureResultName',
     align: 'center',
     required: true,
     choose: false,
@@ -294,41 +317,6 @@
 })
 // 标准配套设备更换表格loding
 const loadingTable = ref(false)
-// 申请文档表头
-const columnsFiles = ref<columnsType[]>([
-  {
-    text: '文件名称',
-    value: 'fileName',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: false,
-  },
-  {
-    text: '上传时间',
-    value: 'createTime',
-    align: 'center',
-    required: true,
-    choose: false,
-    time: true,
-  },
-  {
-    text: '文件说明',
-    value: 'remark',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: false,
-  },
-  {
-    text: '附件文档',
-    value: 'minioFileName',
-    align: 'center',
-    required: true,
-    time: false,
-    choose: true,
-  },
-])
 // 标准配套设备更换表格分页
 const changePage = () => {}
 getStandardOwnerOptions()
@@ -362,6 +350,7 @@
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
   transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
   preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空', trigger: ['blur', 'change'] }],
   managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
   measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
   assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
@@ -413,15 +402,12 @@
   authorityOfIssue: 'xxx公司', // 发证单位
   authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
 }
+
+// ---------------------------------------操作表格-------------------------------------
 // 点击增加行
-const addRoow = () => {
+const addRow = () => {
   // 判断applyEquipmentList上一条数据是否填写
-  if (
-    fromListInfo.value.applyEquipmentList.length >= 1
-    && fromListInfo.value.applyEquipmentList[
-      fromListInfo.value.applyEquipmentList.length - 1
-    ].equipmentId === ''
-  ) {
+  if (fromListInfo.value.applyEquipmentList.length >= 1 && fromListInfo.value.applyEquipmentList[fromListInfo.value.applyEquipmentList.length - 1].equipmentId === '') {
     ElMessage.warning('请完善上一条设备信息')
   }
   else {
@@ -432,50 +418,42 @@
     fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
-// 选择设备之后
-const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
-  fromListInfo.value.fixedAssetsList[listIndex.value] = data
-  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
-  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
-    = infoId.value || ''
-}
-// 增加申请文档列表
-const addRow = () => {
-  if (
-    fromListInfo.value.fileList.length >= 1
-    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
-      .fileName
-  ) {
-    ElMessage.warning('请完善上一条文件信息')
+// 删除行
+const removeRow = () => {
+  if (selectionList.value.length > 0) {
+    fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
+    fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
+      return !selectionList.value.includes(item)
+    })
   }
   else {
-    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
+    ElMessage.warning('请选中')
   }
 }
+// 选择好标准配套设备
+const equipmentAddRow = (data: IFixedAssetsList) => {
+  data.validDate = dayjs(data.validDate).format('YYYY-MM-DD') || ''
+  const index = fromListInfo.value.fixedAssetsList.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    fromListInfo.value.fixedAssetsList[listIndex.value] = data
+    fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+    fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId = infoId.value || ''
+  }
+  else {
+    ElMessage.warning('该设备已存在')
+  }
+}
+
+// -------------------------------------------------------------------------------------
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
 
-// 表格选中的数组
-const SelectionList = ref<object[]>([])
-// 标准实验室发生改变row类型
-interface rowReturn {
-  phone: string
-  director: string
-  deptId: string
-  organizeName: string
-  id: string
-}
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {}
-// 标准实验室清空时
-const clearDeptList = () => {}
-// 文件上传点击对象
-interface fileListItemType {
-  choose: boolean
-}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
@@ -491,17 +469,15 @@
     fromListInfo.value.standardEquipmentId = res.data.id
     // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
-    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
-      item.choose = true
-      return item
-    })
+    formInline.value.applyNo = res.data.applyNo // 申请编号
+    formInline.value.applyName = res.data.applyName // 申请名称
+    formInline.value.applyTime = res.data.applyTime // 申请时间
+    formInline.value.applyUnit = res.data.applyUnit // 申请单位
+    formInline.value.applyUnitName = res.data.applyUnitName // 申请单位名称
+    formInline.value.applyPerson = res.data.applyPerson // 申请人
+    formInline.value.applyPersonName = res.data.applyPersonName // 申请人名称
   })
 }
-// 只要不是新增的数据都得获取到详情信息
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
 
 // 取消
 const handleCancel = () => {
@@ -539,85 +515,95 @@
       break
   }
 }
-// 保存后的id
-const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  // 添加校验条件
-  if (fromListInfo.value.fixedAssetsList) {
-    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
-      ElMessage.warning('标准配套设备更换不能为空!')
-      return
-    }
-  }
-  if (fromListInfo.value.fileList) {
-    if (!fromListInfo.value.fileList[0]?.fileName) {
-      ElMessage.warning('申请文档不能为空!')
-      return
-    }
-  }
 
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) {
-      return
+// 提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
+  }
+  else {
+    submitStandardEquipmentApply({
+      id: addId.value,
+      formId: formId.value,
+    }).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('已提交')
+        close()
+      }
+    })
+  }
+}
+
+// 点击保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 添加校验条件
+  if ($route.meta.title === '更换申请' && fromListInfo.value.fixedAssetsList) {
+    if (!fromListInfo.value.fixedAssetsList[0]?.id) {
+      ElMessage.warning('标准配套设备不能为空')
+      return false
     }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
+  }
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认保存吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = ElLoading.service({
+          lock: true,
+          background: 'rgba(255, 255, 255, 0.8)',
+        })
+        // 保存之前清除空行、避免传给后端无用空对象
+        if (fromListInfo.value.fixedAssetsList && fromListInfo.value.fixedAssetsList.length) {
+          const index = fromListInfo.value.fixedAssetsList.findIndex((item: any) => !item.id)
+          if (index !== -1) {
+            fromListInfo.value.fixedAssetsList.splice(index, 1)
+          }
+        }
+        fromListInfo.value.applyName = formInline.value.applyName // 申请名称固定
+        fromListInfo.value.applyUnit = formInline.value.applyUnit // 申请单位
+        fromListInfo.value.applyUnitName = formInline.value.applyUnitName // 申请单位名称
+        fromListInfo.value.applyPerson = formInline.value.applyPerson // 申请人
+        fromListInfo.value.applyPersonName = formInline.value.applyPersonName // 申请人名称
+        fromListInfo.value.applyTime = formInline.value.applyTime // 申请时间
+        if (pageType.value === 'add') { // 新建
           getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data
+              loading.close()
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) {
-      return
-    }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm('确认保存吗？', '提示', {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitStandardEquipmentApply({
-        id: addId.value,
-        formId: formId.value,
-      }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            failUpdateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
+          else { // 草稿箱、已取消
+            updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                loading.close()
+                close()
+              }
+            })
+          }
         }
       })
     }
-  }
-  else {
-    clickBtn(item)
-  }
+  })
 }
+
 // 审批完成后的回调
 const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
@@ -631,42 +617,10 @@
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 标准配套设备更换表格删除行
-const removeRow = (type: string) => {
-  if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(() => {
-      if (type == '1') {
-        // 删除行
-        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        fromListInfo.value.applyEquipmentList = fromListInfo.value.fixedAssetsList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
-        ElMessage.success('删除成功')
-      }
-      else {
-        // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
-          (item) => {
-            return !SelectionList.value.includes(item)
-          },
-        )
-        ElMessage.success('删除成功')
-      }
-    })
-  }
-  else {
-    ElMessage.warning('请先选择需要删除的数据')
-  }
-}
+
 // 表格多选框
 const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
+  selectionList.value = e
 }
 watch(
   () => formInline.value,
@@ -699,7 +653,7 @@
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
+    formInline.value = { ...formInline.value, ...res.data }
     fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
@@ -708,8 +662,42 @@
   getStandarInfo(data.id)
 }
 
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+
 onMounted(async () => {
   fromListInfo.value.processId = $route.query.processId as string // 任务id
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批名称
+  formInline.value.id = $route.query.id as string // id
+  fromListInfo.value.id = $route.query.id as string // id
+  formInline.value.applyName = `标准装置${$route.meta.title}` // 申请名称固定
+  formInline.value.applyUnit = user.deptId // 申请单位
+  formInline.value.applyUnitName = user.deptName // 申请单位名称
+  formInline.value.applyPerson = user.id // 申请人
+  formInline.value.applyPersonName = user.name // 申请人名称
+  formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+
+  // 编辑、详情获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo(infoId.value)
+  }
+  console.log($route.query.approvalStatusName, $route.query.processId)
+
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(fromListInfo.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -717,13 +705,11 @@
   <app-container>
     <detail-page :title="`${$route.meta.title} -- ${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          v-for="(item, index) in buttonArray"
-          :key="index"
-          type="primary"
-          @click="getAddList(item, ruleFormRef)"
-        >
-          {{ item }}
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -738,12 +724,62 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="formInline.applyNo"
+                :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请名称:">
+              <el-input
+                v-model="formInline.applyName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人:">
+              <el-input
+                v-model="formInline.applyPersonName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请单位:">
+              <el-input
+                v-model="formInline.applyUnitName"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请时间:" prop="applyTime">
+              <el-date-picker
+                v-model="formInline.applyTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请时间'"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model="formInline.standardName"
                 :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
                 class="input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
@@ -762,7 +798,7 @@
               <el-input
                 v-model.trim="formInline.standardNo"
                 class="full-width-input"
-                placeholder="系统编号，自动生成"
+                placeholder="系统自动生成"
                 disabled
               />
             </el-form-item>
@@ -901,7 +937,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="投资总额:">
+            <el-form-item label="投资总额(元):">
               <el-input
                 v-model.trim="formInline.totalInvestment"
                 :placeholder="pageType === 'detail' ? '' : '投资总额'"
@@ -928,13 +964,12 @@
           <el-col :span="6">
             <el-form-item label="标准所在实验室:">
               <el-select
-                v-model="formInline.standardLaboratory"
+                v-model="formInline.standardLaboratoryName"
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
-                @clear="clearDeptList"
               >
                 <el-option
                   v-for="item in standardUsersDeptList"
@@ -1131,16 +1166,12 @@
         </el-row>
       </el-form>
     </detail-page>
-    <detail-block title="标准配套设备更换">
+    <detail-block v-if="$route.meta.title === '更换申请'" title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('1')"
-        >
+        <el-button v-if="pageType !== 'detail'" type="info" @click="removeRow">
           删除行
         </el-button>
       </template>
@@ -1162,6 +1193,7 @@
           :prop="item.value"
           :label="item.text"
           align="center"
+          :width="item.width"
         >
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
@@ -1189,83 +1221,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block title="申请文档">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="removeRow('2')">
-          删除行
-        </el-button>
-      </template>
-      <el-table
-        :data="fromListInfo.fileList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          v-if="pageType !== 'detail'"
-          type="selection"
-          width="38"
-        />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columnsFiles"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-date-picker
-              v-if="item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择上传时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            />
-            <show-photo
-              v-else-if="
-                scope.row.choose && scope.row.minioFileName && item.choose
-              "
-              :minio-file-name="scope.row.minioFileName"
-            />
-            <el-input
-              v-else-if="!item.time && pageType !== 'detail'"
-              v-model="scope.row[item.value]"
-              :autofocus="true"
-              style="height: 5vh;"
-              :placeholder="`${item.text}`"
-            >
-              <template v-if="!scope.row.minioFileName && item.choose" #append>
-                <el-upload
-                  v-model:file-list="fileList"
-                  :http-request="uploadQuarterlyEvaluateFile"
-                >
-                  <el-button
-                    v-if="pageType !== 'detail'"
-                    @click="uploadIndex(scope)"
-                  >
-                    上传
-                  </el-button>
-                </el-upload>
-              </template>
-            </el-input>
-          </template>
-        </el-table-column>
-      </el-table>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
-    <div v-if="pageType === 'detail'">
-      <detail-block title="审批流程">
-        <!-- 审批流程 -->
-        <approval-record :process-id="fromListInfo.processId" />
-      </detail-block>
-    </div>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
diff --git a/src/views/device/standardEquipment/components/listApply/notPass.vue b/src/views/device/standardEquipment/components/listApply/notPass.vue
index bf1d8ac..bd03c93 100644
--- a/src/views/device/standardEquipment/components/listApply/notPass.vue
+++ b/src/views/device/standardEquipment/components/listApply/notPass.vue
@@ -2,9 +2,12 @@
 <script lang="ts" setup name="notPass">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([
+  { name: '查看', type: 'primary' },
+  { name: '编辑', type: 'primary' },
+])
 </script>
 
 <template>
-  <list-page name="未通过" :buttoms="buttoms" approval-status="5" />
+  <list-page name="未通过" :buttons="buttons" approval-status="5" />
 </template>
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index e7a7e25..052487c 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -377,8 +377,8 @@
           range-separator="到"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
-          start-placeholder="到期开始日期"
-          end-placeholder="到期结束日期"
+          start-placeholder="有效日期起始"
+          end-placeholder="有效日期结束"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/pauseApply.vue b/src/views/device/standardEquipment/pauseApply.vue
index 189fbdc..c49b84c 100644
--- a/src/views/device/standardEquipment/pauseApply.vue
+++ b/src/views/device/standardEquipment/pauseApply.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="pauseApply">
+<!-- 暂停申请 -->
+<script lang="ts" setup name="PauseApply">
 import applyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 689e86e..ed415e0 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -117,9 +117,17 @@
 }
 export interface IFixedAssetsList {
   id: string
+  validDate?: string // 有效日期
 }
 // 申请formInline类型
 export interface IformInline {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
   assessDate: string // 考核日期
   assessmentUnit: string // 考核单位
   category: string // 类 别
@@ -198,8 +206,14 @@
 
 // 申请FromListInfo类型
 export interface IFromListInfo {
-  applyDept: string // 申请部门
+  applyName: string // 申请名称
   applyNo: string // 申请编号
+  applyTime: string // 申请时间
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人名称
+  applyDept: string // 申请部门
   applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
   applyTypeName: string // 申请类型名称
   approvalStatus: string // 审批状态
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 119af38..b9a50ef 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -870,18 +870,18 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="附件" prop="minioFileName">
-              <div style="display: flex;">
-                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
-                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">x</span>
-                </show-photo>
-              </div>
-              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
               <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
                 上传
               </el-button>
-              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">暂无</span>
+              <div style="display: flex;">
+                <show-photo v-for="(item, index) in ruleForm1.fileList" :key="item" :index="index" :minio-file-name="item.minioFileName || ''" style="display: inline-block;margin: 10px;">
+                  <span v-if="title !== '详情'" class="photo-close" @click="del(index)">×</span>
+                </show-photo>
+              </div>
+              <input v-show="title === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="title === '详情' && !ruleForm1.fileList[0]?.minioFileName">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 35b77fa..602353f 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -250,6 +250,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -337,6 +338,7 @@
                 align="center"
                 :label="item.text"
                 :width="item.width"
+                show-overflow-tooltip
               />
             </el-table>
           </bench-col>
@@ -367,6 +369,7 @@
                   align="center"
                   :label="item.text"
                   :width="item.width"
+                  show-overflow-tooltip
                 />
               </el-table>
               <div class="validDate">