diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 12945c6..9b6a861 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -10,21 +10,21 @@
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<lPlanistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  ids: [], // 导出数组
+  trainEndTime: '', // 培训结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 删除id
 const deleteId = ref('')
 const total = ref(0)
@@ -126,17 +126,17 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    ids: [], // 导出数组
+    trainEndTime: '', // 培训结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -150,17 +150,8 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      createEndTime: '',
-      createStartTime: '',
-      deptId: 0,
-      director: '',
-      effectiveCompany: '',
-      trainEndTime: '',
-      trainStartTime: '',
-      ids: checkoutList.value,
-    }
-    exportPlanList(params).then((res) => {
+    listQuery.value.ids = checkoutList.value
+    exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -207,14 +198,15 @@
       })
     })
 }
-
-const handelClick = (text: string) => {}
+// 多选框选择数据
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -253,7 +245,7 @@
     printJSON(list.value, properties, '培训计划列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划列表')
   }
   else {
@@ -268,138 +260,136 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-date-picker
-            v-model="trainTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="培训时间开始时间"
-            end-placeholder="培训时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="创建时间开始时间"
-            end-placeholder="创建时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.deptId"
-            clearable
-            placeholder="主管部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="培训时间开始时间"
+          end-placeholder="培训时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="qrDialogShow(row)"
-                >
-                  二维码
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-    <qr-dialog ref="qrDialog" />
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="负责人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="qrDialogShow(row)"
+              >
+                二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <qr-dialog ref="qrDialog" />
 </template>

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 12945c6..9b6a861 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -10,21 +10,21 @@
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<lPlanistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  ids: [], // 导出数组
+  trainEndTime: '', // 培训结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 删除id
 const deleteId = ref('')
 const total = ref(0)
@@ -126,17 +126,17 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    ids: [], // 导出数组
+    trainEndTime: '', // 培训结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -150,17 +150,8 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      createEndTime: '',
-      createStartTime: '',
-      deptId: 0,
-      director: '',
-      effectiveCompany: '',
-      trainEndTime: '',
-      trainStartTime: '',
-      ids: checkoutList.value,
-    }
-    exportPlanList(params).then((res) => {
+    listQuery.value.ids = checkoutList.value
+    exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -207,14 +198,15 @@
       })
     })
 }
-
-const handelClick = (text: string) => {}
+// 多选框选择数据
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -253,7 +245,7 @@
     printJSON(list.value, properties, '培训计划列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划列表')
   }
   else {
@@ -268,138 +260,136 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-date-picker
-            v-model="trainTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="培训时间开始时间"
-            end-placeholder="培训时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="创建时间开始时间"
-            end-placeholder="创建时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.deptId"
-            clearable
-            placeholder="主管部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="培训时间开始时间"
+          end-placeholder="培训时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="qrDialogShow(row)"
-                >
-                  二维码
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-    <qr-dialog ref="qrDialog" />
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="负责人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="qrDialogShow(row)"
+              >
+                二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <qr-dialog ref="qrDialog" />
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2b67950..cbbb01d 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -69,27 +69,19 @@
 const SelectionList = ref([])
 // 校验规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [
-    { required: true, message: '培训对象不能为空', trigger: 'blur' },
+  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
   ],
-  trainNumber: [
-    { required: true, message: '培训人数不能为空', trigger: 'blur' },
-  ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [
-    { required: true, message: '培训地点不能为空', trigger: 'blur' },
-  ],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [
-    { required: true, message: '实施单位不能为空', trigger: 'blur' },
-  ],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [
-    { required: true, message: '培训内容不能为空', trigger: 'blur' },
-  ],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -102,7 +94,8 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
-const addRoow = () => {
+// 增加行
+const addRow = () => {
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
@@ -159,7 +152,6 @@
 }
 // 选完计量人员
 const confirmTrainPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -202,17 +194,6 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
@@ -239,6 +220,14 @@
     }
   })
 }
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -407,7 +396,7 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #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="deleteList">

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 12945c6..9b6a861 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -10,21 +10,21 @@
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<lPlanistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  ids: [], // 导出数组
+  trainEndTime: '', // 培训结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 删除id
 const deleteId = ref('')
 const total = ref(0)
@@ -126,17 +126,17 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    ids: [], // 导出数组
+    trainEndTime: '', // 培训结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -150,17 +150,8 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      createEndTime: '',
-      createStartTime: '',
-      deptId: 0,
-      director: '',
-      effectiveCompany: '',
-      trainEndTime: '',
-      trainStartTime: '',
-      ids: checkoutList.value,
-    }
-    exportPlanList(params).then((res) => {
+    listQuery.value.ids = checkoutList.value
+    exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -207,14 +198,15 @@
       })
     })
 }
-
-const handelClick = (text: string) => {}
+// 多选框选择数据
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -253,7 +245,7 @@
     printJSON(list.value, properties, '培训计划列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划列表')
   }
   else {
@@ -268,138 +260,136 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-date-picker
-            v-model="trainTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="培训时间开始时间"
-            end-placeholder="培训时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="创建时间开始时间"
-            end-placeholder="创建时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.deptId"
-            clearable
-            placeholder="主管部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="培训时间开始时间"
+          end-placeholder="培训时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="qrDialogShow(row)"
-                >
-                  二维码
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-    <qr-dialog ref="qrDialog" />
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="负责人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="qrDialogShow(row)"
+              >
+                二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <qr-dialog ref="qrDialog" />
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2b67950..cbbb01d 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -69,27 +69,19 @@
 const SelectionList = ref([])
 // 校验规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [
-    { required: true, message: '培训对象不能为空', trigger: 'blur' },
+  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
   ],
-  trainNumber: [
-    { required: true, message: '培训人数不能为空', trigger: 'blur' },
-  ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [
-    { required: true, message: '培训地点不能为空', trigger: 'blur' },
-  ],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [
-    { required: true, message: '实施单位不能为空', trigger: 'blur' },
-  ],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [
-    { required: true, message: '培训内容不能为空', trigger: 'blur' },
-  ],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -102,7 +94,8 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
-const addRoow = () => {
+// 增加行
+const addRow = () => {
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
@@ -159,7 +152,6 @@
 }
 // 选完计量人员
 const confirmTrainPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -202,17 +194,6 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
@@ -239,6 +220,14 @@
     }
   })
 }
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -407,7 +396,7 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #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="deleteList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 89541d4..9888dd5 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -28,17 +28,18 @@
   trainTime: string
 }
 
-export interface IlistQuerys {
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  formId: string
-  logNo: string
-  trainEndTime: string
-  trainName: string
-  trainStartTime: string
-  offset: number
-  limit: number
+export interface lPlanistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  ids: string[] // 导出数组
+  trainEndTime: string // 培训结束时间
+  formId: string // 表单id
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 培训审批查询条件
@@ -54,8 +55,8 @@
   limit: number
   ids?: []
 }
-
-export interface ISupplier {
+// 培训计划列表数据
+export interface IPlanList {
   deptId: string
   createTime: string
   deptName: string
@@ -70,6 +71,7 @@
   trainHour: string
   trainNumber: number
   trainPerson: string
+  processId: string
   trainStaffList: [
     {
       company: string

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 12945c6..9b6a861 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -10,21 +10,21 @@
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<lPlanistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  ids: [], // 导出数组
+  trainEndTime: '', // 培训结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 删除id
 const deleteId = ref('')
 const total = ref(0)
@@ -126,17 +126,17 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    ids: [], // 导出数组
+    trainEndTime: '', // 培训结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -150,17 +150,8 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      createEndTime: '',
-      createStartTime: '',
-      deptId: 0,
-      director: '',
-      effectiveCompany: '',
-      trainEndTime: '',
-      trainStartTime: '',
-      ids: checkoutList.value,
-    }
-    exportPlanList(params).then((res) => {
+    listQuery.value.ids = checkoutList.value
+    exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -207,14 +198,15 @@
       })
     })
 }
-
-const handelClick = (text: string) => {}
+// 多选框选择数据
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -253,7 +245,7 @@
     printJSON(list.value, properties, '培训计划列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划列表')
   }
   else {
@@ -268,138 +260,136 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-date-picker
-            v-model="trainTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="培训时间开始时间"
-            end-placeholder="培训时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="创建时间开始时间"
-            end-placeholder="创建时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.deptId"
-            clearable
-            placeholder="主管部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="培训时间开始时间"
+          end-placeholder="培训时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="qrDialogShow(row)"
-                >
-                  二维码
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-    <qr-dialog ref="qrDialog" />
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="负责人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="qrDialogShow(row)"
+              >
+                二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <qr-dialog ref="qrDialog" />
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2b67950..cbbb01d 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -69,27 +69,19 @@
 const SelectionList = ref([])
 // 校验规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [
-    { required: true, message: '培训对象不能为空', trigger: 'blur' },
+  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
   ],
-  trainNumber: [
-    { required: true, message: '培训人数不能为空', trigger: 'blur' },
-  ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [
-    { required: true, message: '培训地点不能为空', trigger: 'blur' },
-  ],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [
-    { required: true, message: '实施单位不能为空', trigger: 'blur' },
-  ],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [
-    { required: true, message: '培训内容不能为空', trigger: 'blur' },
-  ],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -102,7 +94,8 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
-const addRoow = () => {
+// 增加行
+const addRow = () => {
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
@@ -159,7 +152,6 @@
 }
 // 选完计量人员
 const confirmTrainPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -202,17 +194,6 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
@@ -239,6 +220,14 @@
     }
   })
 }
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -407,7 +396,7 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #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="deleteList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 89541d4..9888dd5 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -28,17 +28,18 @@
   trainTime: string
 }
 
-export interface IlistQuerys {
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  formId: string
-  logNo: string
-  trainEndTime: string
-  trainName: string
-  trainStartTime: string
-  offset: number
-  limit: number
+export interface lPlanistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  ids: string[] // 导出数组
+  trainEndTime: string // 培训结束时间
+  formId: string // 表单id
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 培训审批查询条件
@@ -54,8 +55,8 @@
   limit: number
   ids?: []
 }
-
-export interface ISupplier {
+// 培训计划列表数据
+export interface IPlanList {
   deptId: string
   createTime: string
   deptName: string
@@ -70,6 +71,7 @@
   trainHour: string
   trainNumber: number
   trainPerson: string
+  processId: string
   trainStaffList: [
     {
       company: string
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 19fa3f3..6301859 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -64,19 +64,19 @@
 ]
 // 校验规则
 const rules = ref({
-  logNo: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
-  preparer: [{ required: true, message: '填表人不能为空', trigger: 'blur' }],
-  planId: [{ required: true, message: '计划编号必选', trigger: 'blur' }],
-  trainName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: 'blur' }],
-  problems: [{ required: true, message: '存在问题不能为空', trigger: 'blur' }],
-  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
+  logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
+  preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
+  planId: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
+  trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: ['blur', 'change'] }],
+  problems: [{ required: true, message: '存在问题不能为空', trigger: ['blur', 'change'] }],
+  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
 const addPersonList = ref({

diff --git a/src/api/system/price.ts b/src/api/system/price.ts
index e4fdb53..f20de6a 100644
--- a/src/api/system/price.ts
+++ b/src/api/system/price.ts
@@ -12,7 +12,7 @@
 }
 
 // 价格列表查询
-export function getPriceList(data: { offset: number; limit: string }) {
+export function getPriceList(data: { offset: number; limit: number }) {
   return request({
     url: `${prefix}/queryPriceList?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index cbc5c47..d2938a3 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?',
+        path: 'maintenanceList/:type/:id?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listPageAdd.vue'),
         meta: {
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?',
+        path: 'maintenanceCheckList/:type/:id?/:processId?',
         name: 'maintenanceCheckAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index be90c53..554a196 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -10,6 +10,15 @@
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
       approvalStatusList: {
+        全部: '',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      } as approvalStatus, // 审批状态
+      approvalStatusListTow: {
         全部: '0',
         草稿箱: '1',
         待审批: '2',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 8214e2b..133c46a 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -2,6 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import type { selectionListItem } from './environmentalList_interface'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
@@ -31,34 +32,35 @@
   outputVoltage: '', // 输出电压
   zeroGroundVoltage: '', // 零地电压
   remark: '', // 备注
-  recordTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'), // 记录时间
+  recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
-const selectionList = ref([
-  { text: '101', value: '101' },
-  { text: '102', value: '102' },
-  { text: '103', value: '103' },
-  { text: '104', value: '104' },
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
 ])
 // 校验规则
 const rules = ref({
-  roomNumber: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
-  recorder: [
-    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
+  recorder: [{ required: true, message: '记录人不能为空', trigger: ['blur', 'change'] }],
+  recordTime: [{ required: true, message: '记录时间不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '湿度(%)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
   ],
-  recordTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
-  humidity: [
-    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度(℃)只能为数字', trigger: ['blur', 'change'] },
   ],
-  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
-  outputVoltage: [
-    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  outputVoltage: [{ required: true, message: '输出电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '输出电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
-  zeroGroundVoltage: [
-    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  zeroGroundVoltage: [{ required: true, message: '零地电压(V)不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压(V)只能为数字', trigger: ['blur', 'change'] },
   ],
 }) // 表单验证规则
 
@@ -148,10 +150,10 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="环境记录单:">
+            <el-form-item label="记录单号:">
               <el-input
                 v-model="formInline.environmentCode"
-                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成'"
                 disabled
               />
             </el-form-item>
@@ -161,6 +163,7 @@
               <el-select
                 v-model="formInline.roomNumber"
                 clearable
+                filterable
                 :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
                 size="default"
                 :disabled="pageType === 'detail'"
@@ -168,7 +171,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.text"
+                  :label="item.label"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 808d9c4..73b53a0 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -2,12 +2,10 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier } from './environmentalList_interface'
+import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
@@ -20,7 +18,7 @@
   limit: 20, // 多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IEnvironmental[]>([])
 const total = ref(0)
 const show = ref(true)
 
@@ -75,7 +73,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   {
-    text: '编号',
+    text: '记录单号',
     value: 'environmentCode',
     align: 'center',
   },
@@ -92,6 +90,7 @@
   {
     text: '记录时间',
     value: 'recordTime',
+    width: '180',
     align: 'center',
   },
   {
@@ -102,7 +101,6 @@
   {
     text: '湿度(%)',
     value: 'humidity',
-    width: '180',
     align: 'center',
   },
   {
@@ -206,6 +204,13 @@
   }
   fetchData(true)
 }
+// 房间号模拟下拉框数据
+const selectionList = ref<selectionListItem[]>([
+  { label: '101', value: '101' },
+  { label: '102', value: '102' },
+  { label: '103', value: '103' },
+  { label: '104', value: '104' },
+])
 // 打印列表
 function printList() {
   // 打印列
@@ -219,7 +224,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IEnvironmental) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -240,18 +245,27 @@
           />
         </search-item>
         <search-item>
-          <el-input
-            v-model.trim="listQuery.roomNumber"
-            placeholder="房间号"
+          <el-select
+            v-model="listQuery.roomNumber"
             clearable
-          />
+            filterable
+            placeholder="请选择房间号"
+            size="default"
+          >
+            <el-option
+              v-for="item in selectionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-model="trainTime"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY-MM-DD HH:mm:ss"
             value-format="YYYY-MM-DD h:m:s"
             start-placeholder="记录时间开始时间"
             end-placeholder="记录时间结束时间"
@@ -293,7 +307,7 @@
           @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="190">
+            <el-table-column label="操作" align="center" width="160">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 5f3a80f..380583b 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -1,14 +1,19 @@
 // 环境记录单list类型
-export interface ISupplier {
-  environmentCode: string
-  roomNumber: string
-  recorder: string
-  temperature: string
-  humidity: string
-  outputVoltage: string
-  zeroGroundVoltage: string
-  remark: string
-  recordTime: string
-  createUser: string
-  id: string
+export interface IEnvironmental {
+  environmentCode: string // 记录单编号
+  roomNumber: string // 房间号
+  recorder: string // 记录人
+  temperature: string // 温度(℃)
+  humidity: string // 湿度
+  outputVoltage: string // 输出电压(V)
+  zeroGroundVoltage: string // 零地电压(V)
+  remark: string // 备注
+  recordTime: string // 记录时间
+  createUser: string // 创建人
+  id: string // 主键id
+}
+// 房间号模拟下拉框数据类型
+export interface selectionListItem {
+  value: string // 值
+  label: string // lable
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 928cafd..8cd172d 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -272,7 +272,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b3c8cce..c74b7dd 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -223,61 +223,65 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
   originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: 'blur' },
+    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
   ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: 'blur' }],
+  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
   calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: 'blur' },
+    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: 'blur' },
+    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
   ],
   environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: 'blur' },
+    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
   ],
   calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: 'blur' },
+    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
   ],
   temperature: [
-    { required: true, message: '温度不能为空', trigger: 'blur' },
+    { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: 'blur' }],
+  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
   orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: 'blur' },
+    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
   ],
   orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: 'blur' },
+    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
   ],
   orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: 'blur' },
+    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
   ],
   orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: 'blur' },
+    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
   ],
   orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: 'blur' },
+    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
   ],
   sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: 'blur' },
+    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
   ],
   sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: 'blur' },
+    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
   ],
   factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: 'blur' },
+    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
   ],
   model: [
-    { required: true, message: '型号不能为空', trigger: 'blur' },
+    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
   ],
   manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: 'blur' },
+    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
   ],
   verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: 'blur' },
+    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
   ],
-}) // 表单验证规则
+})
 // 第几条数据选择
 const listIndex = ref(0)
 // 底部文件选择下标收集类型
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 97bea6f..e84dea6 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -135,27 +135,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
 const upload = () => {
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 23bc74f..199fae2 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -68,71 +68,33 @@
   originalRecordId: '', // 原始记录id
   remark: '', // 备注
   createUser: '', // 创建人id
-  constructionStandardUnitName: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  contactInfo: '',
-  createTime: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  minioFileName: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  authorityOfDate: '',
-  data: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
+  templateName: '', // 证书报告模板名称
+  signName: '', // 电子签章名称
+  approvalSignName: '', // 认可标准专用章
+  originalRecordName: '', // 原始记录名称
+  calibrationPlace: '', // 校验地点
+  temperature: '', // 温度
+  humidity: '', // 相对湿度
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  leaveNo: '', // 出厂编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerLocation: '', // 委托方地址
+  censorshipUser: '', // 送检人
+  phone: '', // 送检人联系方式
+  expectedDeliveryTime: '', // 预计送达时间
+  expectedCompletionTime: '', // 预计检完时间
+  verificationItems: '', // 检定项目
+  model: '', // 型号
+  manufacturer: '', // 生产厂家
   applyEquipmentList: [],
   fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
   fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
 })
 // 下拉框数组类型
 interface IOptions {
@@ -337,90 +299,35 @@
   // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  calibrationMajor: [
-    { required: true, message: '检校专业不能为空', trigger: 'blur' },
-  ],
-  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
-  certificateReportName: [
-    { required: true, message: '证书名称不能为空', trigger: 'blur' },
-  ],
-  issuanceDate: [
-    { required: true, message: '出具日期不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-  standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+  calibrationMajor: [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  certificateReportCode: [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
+  issuanceDate: [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  templateName: [{ required: true, message: '证书模板不能为空', trigger: ['blur', 'change'] }],
+  signName: [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  approvalSignName: [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  originalRecordName: [{ required: true, message: '原始记录不能为空', trigger: ['blur', 'change'] }],
+  sampleNo: [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  sampleName: [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  manufacturer: [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  temperature: [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  humidity: [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  leaveNo: [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  customerId: [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  customerPhone: [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  customerLocation: [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  verificationItems: [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
 const uploadIndex = (row) => {
   listIndex.value = row.$index
 }
-// 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
-  const fd = new FormData()
-  fd.append('multipartFile', file.file)
-  UploadFile(fd).then((res) => {
-    if (res.code === 200) {
-      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
-      // 重置当前验证
-      ElMessage.success('文件上传成功')
-      fromListInfo.value.fileList[listIndex.value].choose = true
-    }
-  })
-}
 // 选择标准配套设备
 const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
@@ -488,7 +395,7 @@
     fd.append('multipartFile', event.target.files[0])
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
+        formInline.value.certificateReportFile = res.data[0]
         // 重置当前验证
         ElMessage.success('文件上传成功')
       }
@@ -739,7 +646,6 @@
       }
     })
     formInline.value = res.data
-    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
 // 选择标准装置完成之后
@@ -830,10 +736,10 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="证书报告模板:" prop="organizeNo">
+            <el-form-item label="证书报告模板:" prop="templateName">
               <el-input
-                v-model.trim="formInline.organizeNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                v-model.trim="fromListInfo.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告模板'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
               >
@@ -850,10 +756,10 @@
           <el-col :span="6">
             <el-form-item
               label="电子签章:"
-              prop="constructionStandardUnitName"
+              prop="signName"
             >
               <el-input
-                v-model.trim="formInline.constructionStandardUnitName"
+                v-model.trim="fromListInfo.signName"
                 :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -869,9 +775,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="认可标志专用章:" prop="standardOwner">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
               <el-input
-                v-model.trim="formInline.standardOwner"
+                v-model.trim="fromListInfo.approvalSignName"
                 :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -889,21 +795,21 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="证书报告附件:" prop="contactInfo">
-              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="formInline.certificateReportFile" :minio-file-name="formInline.certificateReportFile" />
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.certificateReportFile === '' ? '上传' : '更换附件' }}
               </el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="category">
+            <el-form-item label="原始记录编号:" prop="originalRecordName">
               <el-input
-                v-model.trim="formInline.category"
+                v-model.trim="fromListInfo.originalRecordName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
                 class="full-width-input"
                 :disabled="pageType === 'detail'"
@@ -919,9 +825,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="standardLevel">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
               <el-input
-                v-model.trim="formInline.standardLevel"
+                v-model.trim="fromListInfo.calibrationPlace"
                 :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
@@ -930,9 +836,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="transmitRange">
+            <el-form-item label="温度(℃):" prop="temperature">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.temperature"
                 :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
@@ -941,9 +847,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):">
+            <el-form-item label="相对湿度(%):" prop="humidity">
               <el-input
-                v-model.trim="formInline.transmitRange"
+                v-model.trim="fromListInfo.humidity"
                 :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
@@ -954,9 +860,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="preparationDate">
+            <el-form-item label="样品编号:" prop="sampleNo">
               <el-input
-                v-model.trim="formInline.preparationDate"
+                v-model.trim="fromListInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -965,9 +871,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="standardLaboratory">
+            <el-form-item label="样品名称:" prop="sampleName">
               <el-input
-                v-model.trim="formInline.standardLaboratory"
+                v-model.trim="fromListInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -976,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+            <el-form-item label="出厂编号:" prop="leaveNo">
               <el-input
-                v-model.trim="formInline.laboratoryOwner"
+                v-model.trim="fromListInfo.leaveNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -987,9 +893,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+            <el-form-item label="型号:" prop="model">
               <el-input
-                v-model.trim="formInline.laboratoryOwnerContact"
+                v-model.trim="fromListInfo.model"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -1000,9 +906,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="managerState">
+            <el-form-item label="生产厂家:" prop="manufacturer">
               <el-input
-                v-model.trim="formInline.managerState"
+                v-model.trim="fromListInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -1011,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="measureMajor">
+            <el-form-item label="委托方代码:" prop="customerId">
               <el-input
-                v-model.trim="formInline.measureMajor"
+                v-model.trim="fromListInfo.customerId"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
@@ -1022,9 +928,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="assessmentUnit">
+            <el-form-item label="委托方名称:" prop="customerName">
               <el-input
-                v-model.trim="formInline.assessmentUnit"
+                v-model.trim="fromListInfo.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
@@ -1033,9 +939,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="assessDate">
+            <el-form-item label="委托方电话:" prop="customerPhone">
               <el-input
-                v-model.trim="formInline.standardLevelName"
+                v-model.trim="fromListInfo.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
@@ -1046,9 +952,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="uncertainty">
+            <el-form-item label="委托方地址:" prop="customerLocation">
               <el-input
-                v-model.trim="formInline.uncertainty"
+                v-model.trim="fromListInfo.customerLocation"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
@@ -1059,9 +965,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="送检人:" prop="mesureRange">
+            <el-form-item label="送检人:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.censorshipUser"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -1070,9 +976,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系方式:" prop="mesureRange">
+            <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="formInline.mesureRange"
+                v-model.trim="fromListInfo.phone"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -1081,9 +987,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+            <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="formInline.authorityOfDate"
+                v-model="fromListInfo.expectedDeliveryTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -1095,9 +1001,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:" prop="data">
+            <el-form-item label="预计检完时间:">
               <el-date-picker
-                v-model="formInline.data"
+                v-model="fromListInfo.expectedCompletionTime"
                 type="datetime"
                 style="width: 100%;"
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
@@ -1111,9 +1017,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="standardTemperature">
+            <el-form-item label="检定项目:" prop="verificationItems">
               <el-input
-                v-model.trim="formInline.standardTemperature"
+                v-model.trim="fromListInfo.verificationItems"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 85a2b9b..ae53f44 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -349,7 +349,7 @@
           <el-select
             v-model="listQuery.testCategory"
             placeholder="请选择检测类别"
-            style="width: 100%;"
+            style="width: 195px;"
             clearable
           >
             <el-option
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 6cfe43a..398cfd5 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -118,15 +118,9 @@
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -264,7 +258,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -433,13 +427,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 28b6056..9b78d7d 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -176,10 +176,10 @@
   $router.back()
 }
 const rules = ref({
-  applyName: [{ required: true, message: '验收单名称不能为空', trigger: 'blur' }],
-  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: 'blur' }],
-  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
+  acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
+  overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 审批流程
 const approvalActivities = [
@@ -429,6 +429,9 @@
 const handleClose = () => {
   applyShow.value = false
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -582,17 +585,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 选择用户列表组件 -->
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 6ee056c..568a1b3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -119,15 +119,9 @@
   }
   getEquipmentApplyList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -266,7 +260,7 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}`)
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
@@ -435,13 +429,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
                 size="small"
-                :type="item.type" link
-                @click="clickBtn(row, item.name)"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="status === '' || status === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="status === '' || status === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="status !== '4' && status !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 2e26efe..d24d792 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -22,7 +22,6 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'detail') {
@@ -49,25 +48,25 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '8',
+  applyType: '8', //
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
   createTime: '',
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  id: null,
+  id: null, // 主键
   isDel: null,
   overhaulPerson: '',
-  processId: '',
+  processId: '', // 审批id
   processResult: '',
   remark: '',
   taskId: '',
   time: '',
-  updateTime: '',
+  updateTime: '', // 更新时间
   version: '',
 })
 // 审批弹窗信息收集类型
@@ -177,31 +176,12 @@
 const close = () => {
   $router.back()
 }
-// 审批流程
-const approvalActivities = [
-  {
-    name: '张三',
-    deptName: '审计局',
-    content: '同意',
-    timestamp: '2018-04-15 08:00:00',
-  },
-  {
-    name: '张三',
-    content: 'Approved',
-    timestamp: '2018-04-13',
-  },
-  {
-    name: '张三',
-    content: 'Success',
-    timestamp: '2018-04-11',
-  },
-]
 // 表单验证规则
 const rules = ref({
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: ['blur', 'change'] }],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: ['blur', 'change'] }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: ['blur', 'change'] }],
+  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 })
 // 获取部门列表
 getDeptTreeList().then((res) => {
@@ -404,6 +384,9 @@
   }
   applyListClose()
 }
+onMounted(async () => {
+  formInline.value.processId = $route.params.processId as string // 任务id
+})
 // 审批弹窗关闭
 const handleClose = () => {
   applyShow.value = false
@@ -544,20 +527,7 @@
     </detail-block>
     <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div>
-              <span>审批人：</span>{{ activity.name }}
-              <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-            </div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="formInline.processId" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 0557531..15bd42d 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -71,13 +71,13 @@
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
-  checkName: [{ required: true, message: '检查表名称', trigger: 'blur' }],
-  checkPerson: [{ required: true, message: '检查人不能为空', trigger: 'blur' }],
-  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: 'blur' }],
-  checkDate: [{ required: true, message: '检查日期不能为空', trigger: 'blur' }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: 'blur' }],
-  checkResult: [{ required: true, message: '检查结果不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '内容描述不能为空', trigger: 'blur' }],
+  checkName: [{ required: true, message: '检查表名称', trigger: ['blur', 'change'] }],
+  checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
+  managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
+  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
+  remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 0f2a9be..be35c51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -7,54 +7,52 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
-    default: '',
+    default: '', // 申请类型名字
   },
-  // 表单id
   schedule: {
     type: String,
-    default: '',
+    default: '', // 表单id
   },
   buttons: {
     type: Array as PropType<Ibuttons[]>,
-    default: () => [],
+    default: () => [], // 按钮数组
   },
   applyType: {
     type: String,
-    default: '1',
+    default: '1', // 申请类型
   },
   approvalStatus: {
     type: String,
-    default: '', // 代表全部
+    default: '', // 审批状态 ‘’代表全部
   },
 })
 const emit = defineEmits(['setData']) // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  applyNo: '',
-  applyStatus: '',
-  applyType: props.applyType,
-  approvalStatus: props.approvalStatus,
-  createUser: '',
-  equipmentNo: '',
+  applyNo: '', // 申请编号
+  applyStatus: '', // 申请状态
+  applyType: props.applyType, // 申请类型
+  approvalStatus: props.approvalStatus, // 审批状态
+  createUser: '', // 用户
+  equipmentNo: '', // 设备编号
   organizeNo: '',
-  formId: props.schedule,
-  standardName: '',
-  standardNo: '',
-  limit: 20,
-  offset: 1,
+  formId: props.schedule, // 表单id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  limit: 20, // 一页多少条
+  offset: 1, // 第几页
 })
 // 初始化路由
 const $router = useRouter()
 // 控制是否显示新增页面
 const show = ref(true)
-// 表格数据
+// 表格数据。
 const list = ref([])
 // 总数
 const total = ref(0)
@@ -178,6 +176,7 @@
   standardOwner: string
   createTime: string
   taskId: string
+  processId: string
 }
 // 点击删除
 const handleDelete = (row: rowReturn) => {
@@ -215,6 +214,7 @@
       id: row.id,
       applyType: props.applyType,
       formId: props.schedule,
+      processId: row.processId,
     },
   })
 }
@@ -309,9 +309,6 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -351,27 +348,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -382,14 +359,6 @@
   }
   fetchData(true)
 }
-// 上传功能
-const upload = () => {
-  fileRef.value.click()
-}
-// 上传
-const uploadAll = () => {
-  upload()
-}
 // 新建
 const add = () => {
   $router.push({
@@ -409,11 +378,6 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
 // 导出id类型
 interface ISupplier {
   id: never
@@ -431,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
@@ -449,86 +413,153 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.applyNo"
-            placeholder="申请编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.equipmentNo"
-            placeholder="设备编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardNo"
-            placeholder="标准代码"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.standardName"
-            placeholder="标准名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model.trim="listQuery.organizeNo"
-            clearable
-            placeholder="申请部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in standardUsersDeptList"
-              :key="item.id"
-              :label="item.organizeName"
-              :value="item.id"
-            />
-          </el-select>
-        </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>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model.trim="listQuery.organizeNo"
+          clearable
+          placeholder="申请部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in standardUsersDeptList"
+            :key="item.id"
+            :label="item.organizeName"
+            :value="item.id"
+          />
+        </el-select>
+      </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"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="300">
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="approvalStatus === '1' || approvalStatus === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="approvalStatus === '' || approvalStatus === '3'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="approvalStatus !== '4' && approvalStatus !== '5'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <!-- 审批弹窗 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 29c7d45..521b80e 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -53,72 +53,66 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: '',
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类 别
+  categoryName: '', // 类 别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  id: '', // 主键id
+  laboratoryOwner: '', // 实验室
+  laboratoryOwnerContact: '', // 实验室负责人
+  laboratoryOwnerName: '', // 实验室名称
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: null, // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: null, // 标准温度
+  totalInvestment: null, // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
 })
 
 const fromListInfo = ref({
-  applyDept: '',
-  applyNo: '',
-  applyType: $route.query.applyType,
-  applyTypeName: '',
-  approvalStatus: '',
-  applyEquipmentList: [],
-  fixedAssetsList: [],
-  approvalStatusName: '',
-  constructionStandardUnitName: '',
-  createTime: null,
-  createUser: null,
-  fileList: [],
-  id: null,
-  isDel: '',
-  processId: '',
-  remark: '',
-  standardEquipmentId: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  updateTime: null,
-  version: null,
-  taskId: '',
+  applyDept: '', // 申请部门
+  applyNo: '', // 申请编号
+  applyType: $route.query.applyType, // 申请类型
+  applyTypeName: '', // 申请类型名称
+  approvalStatus: '', // 审批状态
+  applyEquipmentList: [], // 申请设备列表
+  fixedAssetsList: [], // 申请设备上传列表
+  approvalStatusName: '', // 审批状态名称
+  constructionStandardUnitName: '', // 建标单位名称
+  createTime: null, // 创建时间
+  createUser: null, // 创建人
+  fileList: [], // 文件列表
+  id: '', // 主键id
+  processId: '', // 审批id
+  remark: '', // 备注
+  standardEquipmentId: '', // 标准装置id
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  standardOwner: '', // 标准负责人
+  taskId: '', // 任务id
 })
 // 下拉框数组类型
 interface IOptions {
@@ -188,7 +182,7 @@
     major: '', // 计量专业
     verifierCertificateNo: '', // 证书号
     certificateStatus: '', // 证书状态
-    limit: 100000,
+    limit: 999999,
     offset: 1,
   }
   getStaffList(params).then((res) => {
@@ -212,17 +206,17 @@
 const applyList = ref<applyListType>({
   select: '',
   epilog: '',
-  approval: '',
-  approvalTime: '',
+  approval: '', // 审批内容
+  approvalTime: '', // 审批时间
 })
 // 标准配套设备表头类型
 interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
+  text: string // 表头名称
+  value: string // 内容
+  align: string // 对齐方式
+  required: Boolean // 是否必填
+  choose: Boolean // 是否有按钮
+  time: Boolean // 是否是时间选择框
 }
 
 // 标准配套设备更换表头
@@ -352,78 +346,42 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  // emit('close')
   $router.back()
 }
+// 表单验证规则
 const rules = ref({
-  standardName: [
-    { required: true, message: '标准名称不能为空', trigger: 'blur' },
-  ],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [
-    { required: true, message: '建标项目不能为空', trigger: 'blur' },
-  ],
-  organizeNo: [
-    { required: true, message: '组织机构代码不能为空', trigger: 'blur' },
-  ],
-  constructionStandardUnitName: [
-    { required: true, message: '建标单位名称不能为空', trigger: 'blur' },
-  ],
-  standardOwner: [
-    { required: true, message: '标准负责人不能为空', trigger: 'blur' },
-  ],
-  contactInfo: [
-    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-  ],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [
-    { required: true, message: '标准等级不能为空', trigger: 'blur' },
-  ],
-  transmitRange: [
-    { required: true, message: '传递范围不能为空', trigger: 'blur' },
-  ],
-  preparationDate: [
-    { required: true, message: '筹建日期不能为空', trigger: 'blur' },
-  ],
-  managerState: [
-    { required: true, message: '管理状态不能为空', trigger: 'blur' },
-  ],
-  measureMajor: [
-    { required: true, message: '计量专业不能为空', trigger: 'blur' },
-  ],
-  assessmentUnit: [
-    { required: true, message: '考核单位不能为空', trigger: 'blur' },
-  ],
-  assessDate: [
-    { required: true, message: '考核日期不能为空', trigger: 'blur' },
-  ],
-  uncertainty: [
-    { required: true, message: '不确定度不能为空', trigger: 'blur' },
-  ],
-  mesureRange: [
-    { required: true, message: '测量范围不能为空', trigger: 'blur' },
-  ],
-  standardTemperature: [
-    { required: true, message: '标准温度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准温度只能为数字',
-      trigger: 'blur',
-    },
-  ],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: ['blur', 'change'] }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: ['blur', 'change'] }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: ['blur', 'change'] }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: ['blur', 'change'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
   standardHumidity: [
-    { required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    {
-      pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/,
-      message: '标准湿度只能为数字',
-      trigger: 'blur',
-    },
-  ],
-}) // 表单验证规则
+    { required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
+})
 // 第几条数据选择
 const listIndex = ref(0)
 
-const uploadIndex = (row) => {
+// 文件上传点击对象
+interface uploadIndexRowType {
+  $index: number
+}
+// 文件上传点击第几行
+const uploadIndex = (row: uploadIndexRowType) => {
   listIndex.value = row.$index
 }
 // 上传请求
@@ -455,6 +413,7 @@
 }
 // 点击增加行
 const addRoow = () => {
+  // 判断applyEquipmentList上一条数据是否填写
   if (
     fromListInfo.value.applyEquipmentList.length >= 1
     && fromListInfo.value.applyEquipmentList[
@@ -472,7 +431,7 @@
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: object) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -511,23 +470,33 @@
 const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
 const clearDeptList = () => {}
+// 文件上传点击对象
+interface fileListItemType {
+  choose: boolean
+}
 // 获取详情信息
 const getInfo = (id: string | number) => {
   getStandardLisdetali({ id }).then((res) => {
+    // 判断下拉框返回的数据是否是number类型，如果是就得转成string类型
     Object.keys(res.data).map((item) => {
       if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
+    // 给数据对象赋值
     formInline.value = res.data.meterStandardEquipment
+    // 拿到当前的标准设备id
     fromListInfo.value.standardEquipmentId = res.data.id
+    // 拿到当前的设备信息
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    // 给文件对象里面每条数据添加一个boolean值方便下面渲染组件使用
+    fromListInfo.value.fileList = res.data.fileList.map((item: fileListItemType) => {
       item.choose = true
       return item
     })
   })
 }
+// 只要不是新增的数据都得获取到详情信息
 if (pageType.value !== 'add') {
   getInfo(infoId.value)
 }
@@ -535,8 +504,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: fromListInfo.value.taskId!,
-    comments: '',
+    taskId: fromListInfo.value.taskId!, // 任务id
+    comments: '', // 取消内容
   }
   ElMessageBox.confirm('确认取消该审批吗？', '提示', {
     confirmButtonText: '确认',
@@ -741,6 +710,10 @@
 const StandarAddRow = (data: dataReturn) => {
   getStandarInfo(data.id)
 }
+
+onMounted(async () => {
+  fromListInfo.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -1293,20 +1266,7 @@
     <div v-if="pageType === 'detail'">
       <detail-block title="审批流程">
         <!-- 审批流程 -->
-        <div>
-          <el-timeline>
-            <el-timeline-item
-              v-for="(activity, index) in approvalActivities"
-              :key="index"
-              :timestamp="activity.timestamp"
-            >
-              <div>
-                <span>审批人：</span>{{ activity.name }}
-                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
-              </div>
-            </el-timeline-item>
-          </el-timeline>
-        </div>
+        <approval-record :process-id="fromListInfo.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index f8fd6a9..d612517 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -138,27 +138,27 @@
   emit('close')
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
-  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
-  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
-  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
-  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
-  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
-  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
-  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
-  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
-  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
-  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
-  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
-  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
-  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
-  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
-  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
-  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
-    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: ['blur', 'change'] }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: ['blur', 'change'] }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: ['blur', 'change'] }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: ['blur', 'change'] }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: ['blur', 'change'] }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: ['blur', 'change'] }],
+  category: [{ required: true, message: '类 别不能为空', trigger: ['blur', 'change'] }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: ['blur', 'change'] }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: ['blur', 'change'] }],
+  preparationDate: [{ 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'] }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: ['blur', 'change'] }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: ['blur', 'change'] }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: ['blur', 'change'] }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: ['blur', 'change'] }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 
 // 标准实验室发生改变row类型
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index cadf4b4..71a829b 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -10,18 +10,18 @@
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
-  category: '',
-  id: null,
-  managerState: '',
-  preparationEndDate: '',
-  preparationStartDate: '',
-  standardLaboratory: '',
-  standardName: '',
-  standardNo: '',
-  validEndTime: '',
-  validStartTime: '',
-  offset: 1,
-  limit: 20,
+  category: '', // 类别
+  id: '', // 主键id
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 结束时间
+  preparationStartDate: '', // 开始时间
+  standardLaboratory: '', // 标准所在部门
+  standardName: '', // 标准名称
+  standardNo: '', // 标准编号
+  validEndTime: '', // 结束时间
+  validStartTime: '', // 开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -153,18 +153,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: '',
-    id: null,
-    managerState: '',
-    preparationEndDate: '',
-    preparationStartDate: '',
-    standardLaboratory: '',
-    standardName: '',
-    standardNo: '',
-    validEndTime: '',
-    validStartTime: '',
-    offset: 1,
-    limit: 20,
+    category: '', // 类别
+    id: '', // 主键id
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 结束时间
+    preparationStartDate: '', // 开始时间
+    standardLaboratory: '', // 标准所在部门
+    standardName: '', // 标准名称
+    standardNo: '', // 标准编号
+    validEndTime: '', // 结束时间
+    validStartTime: '', // 开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   preparation.value = ''
   validTime.value = ''
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index ee7098f..c6a4885 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,13 +2,12 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-// 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
   category: '', // 类别
@@ -26,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref([]) // 存放数据
+const list = ref<ISupplier[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -114,10 +113,6 @@
   })
 }
 fetchData(true)
-// 导出id类型
-interface ISupplier {
-  id: never
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -200,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
@@ -228,6 +223,7 @@
       validStartTime: listQuery.value.validStartTime, // 到期开始日期
       ids: checkoutList.value,
     }
+    // 导出接口
     getExportExcel(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '标准装置列表.xlsx')
@@ -236,6 +232,7 @@
   else {
     ElMessage.warning('无数据可导出数据')
   }
+  // 关闭loading
   loading.close()
 }
 // 新增
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 97c4b60..e715195 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -12,6 +12,52 @@
   remark: string
 }
 
+// list数据类型
+export interface ISupplier {
+  assessDate: string
+  assessmentUnit: string
+  category: string
+  categoryName: string
+  constructionStandardProject: string
+  constructionStandardUnitName: string
+  contactInfo: string
+  createTime: string
+  createUser: string
+  fileList: string
+  id: string
+  isDel: number
+  laboratoryOwner: string
+  laboratoryOwnerContact: string
+  laboratoryOwnerName: string
+  managerState: string
+  managerStateName: string
+  measureMajor: string
+  measureMajorName: string
+  mesureRange: string
+  organizeNo: string
+  preparationDate: string
+  projectNo: string
+  remark: string
+  remindTime: string
+  standardHumidity: string
+  standardLaboratory: string
+  standardLaboratoryName: string
+  standardLevel: string
+  standardLevelName: string
+  standardName: string
+  standardNo: string
+  standardOwner: string
+  standardOwnerName: string
+  standardTemperature: string
+  totalInvestment: string
+  transmitRange: string
+  transmitRangeName: string
+  uncertainty: string
+  updateTime: string
+  validTime: string
+  version: string
+}
+
 // 查询条件类型
 export interface IlistQuery {
   applyNo: string
@@ -84,6 +130,6 @@
 
 // 按钮类型
 export interface Ibuttons {
-  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  type: string
   name: string
 }
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 8a2ffb4..07cac5e 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -2,16 +2,14 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import type { IlistQuery, IlistType, optionsType, priceForm } from './list_interface'
-import ListPriceAdd from './priceAdd.vue'
+import { useRouter } from 'vue-router'
+import type { IlistQuery, optionsType, priceForm } from './list_interface'
 import { exportPriceList, getDeletePrice, getPriceList, getTypeSelect, uploadPrice } from '@/api/system/price'
-import { exportExcel } from '@/utils/exportXlsx'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<IlistQuery>({
   checkType: '', // 检校类型
   priceItem: '', // 项目
   priceName: '', // 价格名称
@@ -20,8 +18,6 @@
   offset: 1, // 页码
   limit: 20, // 分页数量
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref([])
 // 总数
@@ -140,13 +136,13 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkType: '',
-    priceItem: '',
-    priceName: '',
-    priceNo: '',
-    priceType: '',
-    offset: 1,
-    limit: 20,
+    checkType: '', // 检校类型
+    priceItem: '', // 项目
+    priceName: '', // 价格名称
+    priceNo: '', // 价格编号
+    priceType: '', // 类别
+    offset: 1, // 页码
+    limit: 20, // 分页数量
   }
   fetchData()
 }
diff --git a/src/views/measure/price/list_interface.ts b/src/views/measure/price/list_interface.ts
index 6f4ba44..13144d2 100644
--- a/src/views/measure/price/list_interface.ts
+++ b/src/views/measure/price/list_interface.ts
@@ -1,32 +1,19 @@
 export interface IlistQuery {
-  checkType: string
+  checkType: string // 检校类型
   // model: string
-  priceItem: string
-  priceName: string
-  priceNo: string
-  priceType: string
-  limit: number
-  offset: number
+  priceItem: string // 项目
+  priceName: string // 价格名称
+  priceNo: string // 价格编号
+  priceType: string // 类别
+  limit: number // 页码
+  offset: number // 分页数量
 }
 
-export interface IlistType {
-  priceNo: string
-  priceName: string
-  checkType: string
-  model: string
-  priceType: string
-  priceItem: string
-  price: string
-  operatorDiscountPermission: string
-  directorDiscountPermission: string
-  priceStandard: string
-  createTime: string
-}
-
+// 下拉框类型
 export interface optionsType {
-  id: string
-  name: string
-  value: string
+  id: string // id
+  name: string // label
+  value: string // 值
 }
 // 历史价格对象
 export interface historyPriceItem {
@@ -47,7 +34,7 @@
   directorDiscountPermission: string // 负责人折扣权限-字典value
   historicalPriceList?: historyPriceItem[] // 历史价格列表
   id: null | string // 主键id
-  isDel?: number // 删除标记
+  isDel?: string // 删除标记
   model: string // 型号
   operatorDiscountPermission: string // 业务员折扣权限-字典value
   price: string // 标准价格(元)
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 6a5aafa..f9466e8 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -24,42 +24,46 @@
     infoId.value = $route.params.id as string
   }
 }
+// 默认数据
 const defaultForm: priceForm = {
-  checkType: '',
-  createTime: null,
-  directorDiscountPermission: '',
-  id: null,
-  isDel: 0,
-  model: '',
-  operatorDiscountPermission: '',
-  price: '',
-  priceDescription: '',
-  priceItem: '',
-  priceLimit: '',
-  priceName: '',
-  priceNo: '',
-  priceStandard: '',
-  priceType: '',
-  remark: '',
-  updateTime: null,
+  checkType: '', // 检校类型
+  createTime: null, // 创建时间
+  directorDiscountPermission: '', // 负责人折扣权限-字典value
+  id: null, // 主键id
+  isDel: '', // 删除标记
+  model: '', // 型号
+  operatorDiscountPermission: '', // 业务员折扣权限-字典value
+  price: '', // 标准价格(元)
+  priceDescription: '', // 说明
+  priceItem: '', //	项目-字典value
+  priceLimit: '', //	限制范围
+  priceName: '', // 价格名称
+  priceNo: '', // 价格编号
+  priceStandard: '', // 依据标准-计量规程文件名
+  priceType: '', // 价格类别-字典value
+  remark: '', // 备注
+  updateTime: null, // 更新时间
 }
+// 获取到的详情数据
 const formInline: Ref<priceForm> = ref({ ...defaultForm })
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
+// 表单验证规则
 const rules = reactive<FormRules>({
-  priceName: [{ required: true, message: '价格名称不能为空', trigger: 'blur' }],
-  checkType: [{ required: true, message: '校验类型不能为空', trigger: 'blur' }],
-  priceType: [{ required: true, message: '类别不能为空', trigger: 'blur' }],
-  priceItem: [{ required: true, message: '项目不能为空', trigger: 'blur' }],
-  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: 'blur' }],
-  price: [{ required: true, message: '标准价格不能为空', trigger: 'blur' }],
-  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: 'blur' }],
-  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const checkTypeOptions = ref<optionsType[]>([])
-const priceTypeOptions = ref<optionsType[]>([])
-const priceItemOptions = ref<optionsType[]>([])
-const operatorDiscountPermissionOptions = ref<optionsType[]>([])
-const directorDiscountPermissionOptions = ref<optionsType[]>([])
+  priceName: [{ required: true, message: '价格名称不能为空', trigger: ['blur', 'change'] }],
+  checkType: [{ required: true, message: '校验类型不能为空', trigger: ['blur', 'change'] }],
+  priceType: [{ required: true, message: '类别不能为空', trigger: ['blur', 'change'] }],
+  priceItem: [{ required: true, message: '项目不能为空', trigger: ['blur', 'change'] }],
+  priceStandard: [{ required: true, message: '依据标准不能为空', trigger: ['blur', 'change'] }],
+  price: [{ required: true, message: '标准价格不能为空', trigger: ['blur', 'change'] }],
+  operatorDiscountPermission: [{ required: true, message: '业务员折扣权限不能为空', trigger: ['blur', 'change'] }],
+  directorDiscountPermission: [{ required: true, message: '负责人折扣权限不能为空', trigger: ['blur', 'change'] }],
+})
+const checkTypeOptions = ref<optionsType[]>([]) // 校验类型
+const priceTypeOptions = ref<optionsType[]>([]) // 类别
+const priceItemOptions = ref<optionsType[]>([]) // 项目
+const operatorDiscountPermissionOptions = ref<optionsType[]>([]) // 业务员折扣权限
+const directorDiscountPermissionOptions = ref<optionsType[]>([]) // 负责人折扣权限
 const $router = useRouter()
 const close = () => {
   $router.back()
@@ -92,11 +96,11 @@
     }
   })
 }
-getOptions('checkType')
-getOptions('priceType')
-getOptions('priceItem')
-getOptions('operatorDiscountPermission')
-getOptions('directorDiscountPermission')
+getOptions('checkType') // 校验类型
+getOptions('priceType') // 类别
+getOptions('priceItem') // 项目
+getOptions('operatorDiscountPermission')// 业务员折扣权限
+getOptions('directorDiscountPermission') // 负责人折扣权限
 
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -146,14 +150,11 @@
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
-        else {
-          // 打印
-
-        }
       })
     }
   })
 }
+// 只要不是新增页面就得获取详情
 if (pageType.value !== 'add') {
   getInfo()
 }
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 9eb25b4..0af7e91 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -101,9 +101,9 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '公司名称不能为空', trigger: ['blur', 'change'] }],
+  businessContent: [{ required: true, message: '业务内容不能为空', trigger: ['blur', 'change'] }],
+  taxNumber: [{ required: true, message: '税号不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index de4ea54..2c8199d 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -141,15 +141,9 @@
   }
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
-    // list.value = [
-    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
-    // ]
     loadingTable.value = false
   })
 }
@@ -465,13 +459,82 @@
           <el-table-column label="操作" align="center" :width="operationWidth">
             <template #default="{ row }">
               <el-button
-                v-for="(item, index) in buttons"
-                :key="index"
-                size="small" :type="item.type"
+                size="small"
+                type="primary"
                 link
-                @click="clickBtn(row, item.name)"
+                @click="clickBtn(row, '查看')"
               >
-                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="status === '1' || status === '6'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 6e1cde3..c0915bb 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -28,7 +28,7 @@
     infoId.value = $route.params.id as string
   }
 }
-// 溯源供方详情表单
+// 详情表单
 const dataForm = ref<ISupplier>({
   deptId: '',
   deptName: '',
@@ -43,6 +43,7 @@
   trainNumber: 0,
   trainPerson: '',
   taskId: '',
+  processId: '',
   trainStaffList: [
     {
       company: '',
@@ -154,6 +155,9 @@
       break
   }
 }
+onMounted(async () => {
+  dataForm.value.processId = $route.query.processId as string // 任务id
+})
 </script>
 
 <template>
@@ -171,17 +175,7 @@
     </detail-page>
     <detail-block title="审批流程">
       <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
+      <approval-record :process-id="dataForm.processId" />
     </detail-block>
     <detail-block title="人员信息">
       <el-table
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 12945c6..9b6a861 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -10,21 +10,21 @@
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<lPlanistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  ids: [], // 导出数组
+  trainEndTime: '', // 培训结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 删除id
 const deleteId = ref('')
 const total = ref(0)
@@ -126,17 +126,17 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    ids: [], // 导出数组
+    trainEndTime: '', // 培训结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -150,17 +150,8 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    const params = {
-      createEndTime: '',
-      createStartTime: '',
-      deptId: 0,
-      director: '',
-      effectiveCompany: '',
-      trainEndTime: '',
-      trainStartTime: '',
-      ids: checkoutList.value,
-    }
-    exportPlanList(params).then((res) => {
+    listQuery.value.ids = checkoutList.value
+    exportPlanList(listQuery.value).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -207,14 +198,15 @@
       })
     })
 }
-
-const handelClick = (text: string) => {}
+// 多选框选择数据
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -253,7 +245,7 @@
     printJSON(list.value, properties, '培训计划列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划列表')
   }
   else {
@@ -268,138 +260,136 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-date-picker
-            v-model="trainTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="培训时间开始时间"
-            end-placeholder="培训时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="createTime"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            start-placeholder="创建时间开始时间"
-            end-placeholder="创建时间结束时间"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.deptId"
-            clearable
-            placeholder="主管部门"
-            size="default"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="培训时间开始时间"
+          end-placeholder="培训时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="创建时间开始时间"
+          end-placeholder="创建时间结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row, 'edit')"
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="qrDialogShow(row)"
-                >
-                  二维码
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-    <qr-dialog ref="qrDialog" />
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="负责人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" width="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="qrDialogShow(row)"
+              >
+                二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+  <qr-dialog ref="qrDialog" />
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2b67950..cbbb01d 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -69,27 +69,19 @@
 const SelectionList = ref([])
 // 校验规则
 const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [
-    { required: true, message: '培训对象不能为空', trigger: 'blur' },
+  planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
+  planName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '培训人数只能为数字', trigger: ['blur', 'change'] },
   ],
-  trainNumber: [
-    { required: true, message: '培训人数不能为空', trigger: 'blur' },
-  ],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [
-    { required: true, message: '培训地点不能为空', trigger: 'blur' },
-  ],
-  deptId: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [
-    { required: true, message: '实施单位不能为空', trigger: 'blur' },
-  ],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [
-    { required: true, message: '培训内容不能为空', trigger: 'blur' },
-  ],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  deptId: [{ required: true, message: '主管部门不能为空', trigger: ['blur', 'change'] }],
+  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: ['blur', 'change'] }],
+  director: [{ required: true, message: '负责人不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 初始化router
 const $router = useRouter()
@@ -102,7 +94,8 @@
 const selectPerson = () => {
   userListRef.value.initDialog()
 }
-const addRoow = () => {
+// 增加行
+const addRow = () => {
   formInline.value.trainStaffList.push(
     JSON.parse(JSON.stringify(addPersonList.value)),
   )
@@ -159,7 +152,6 @@
 }
 // 选完计量人员
 const confirmTrainPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -202,17 +194,6 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
@@ -239,6 +220,14 @@
     }
   })
 }
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -407,7 +396,7 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #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="deleteList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 89541d4..9888dd5 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -28,17 +28,18 @@
   trainTime: string
 }
 
-export interface IlistQuerys {
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  formId: string
-  logNo: string
-  trainEndTime: string
-  trainName: string
-  trainStartTime: string
-  offset: number
-  limit: number
+export interface lPlanistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  ids: string[] // 导出数组
+  trainEndTime: string // 培训结束时间
+  formId: string // 表单id
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 培训审批查询条件
@@ -54,8 +55,8 @@
   limit: number
   ids?: []
 }
-
-export interface ISupplier {
+// 培训计划列表数据
+export interface IPlanList {
   deptId: string
   createTime: string
   deptName: string
@@ -70,6 +71,7 @@
   trainHour: string
   trainNumber: number
   trainPerson: string
+  processId: string
   trainStaffList: [
     {
       company: string
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 19fa3f3..6301859 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -64,19 +64,19 @@
 ]
 // 校验规则
 const rules = ref({
-  logNo: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
-  preparer: [{ required: true, message: '填表人不能为空', trigger: 'blur' }],
-  planId: [{ required: true, message: '计划编号必选', trigger: 'blur' }],
-  trainName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: 'blur' }],
-  problems: [{ required: true, message: '存在问题不能为空', trigger: 'blur' }],
-  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
+  logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
+  preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
+  planId: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
+  trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
+  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] }],
+  trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
+  trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
+  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
+  trainEffect: [{ required: true, message: '培训效果不能为空', trigger: ['blur', 'change'] }],
+  problems: [{ required: true, message: '存在问题不能为空', trigger: ['blur', 'change'] }],
+  improveMethod: [{ required: true, message: '改进措施不能为空', trigger: ['blur', 'change'] }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
 const addPersonList = ref({
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 1e3144a..8fc73a5 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -18,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
 
 }
@@ -67,7 +67,7 @@
 const currentButtons = ref<IButton[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
-const approvalStatusList = dictStore.getApprovalStatus
+const approvalStatusList = dictStore.approvalStatusListTow
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {