diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c20379d..5de6775 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,7 +5,7 @@
 // import { Row } from 'element-plus/es/components/table-v2/src/components'
 // import VuePdfEmbed from 'vue-pdf-embed'
 // import * as pdfjsLib from 'pdfjs-dist'
-import print from 'vue3-print-nb'
+// import print from 'vue3-print-nb'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -244,7 +244,6 @@
   var ordonnance = document.getElementById(val)!.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
-
     ordonnance.print()
   }, 100)
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c20379d..5de6775 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,7 +5,7 @@
 // import { Row } from 'element-plus/es/components/table-v2/src/components'
 // import VuePdfEmbed from 'vue-pdf-embed'
 // import * as pdfjsLib from 'pdfjs-dist'
-import print from 'vue3-print-nb'
+// import print from 'vue3-print-nb'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -244,7 +244,6 @@
   var ordonnance = document.getElementById(val)!.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
-
     ordonnance.print()
   }, 100)
 }
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 923aac4..bf473cf 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -65,7 +65,7 @@
 // 自定义校验规则--要求检完时间不能比预计送达时间大
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求检完时间不能为空'))
+    return callback(new Error('要求检完时间必填'))
   }
   if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
     return callback(new Error('要求检完时间应大于预计送达时间'))

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c20379d..5de6775 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,7 +5,7 @@
 // import { Row } from 'element-plus/es/components/table-v2/src/components'
 // import VuePdfEmbed from 'vue-pdf-embed'
 // import * as pdfjsLib from 'pdfjs-dist'
-import print from 'vue3-print-nb'
+// import print from 'vue3-print-nb'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -244,7 +244,6 @@
   var ordonnance = document.getElementById(val)!.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
-
     ordonnance.print()
   }, 100)
 }
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 923aac4..bf473cf 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -65,7 +65,7 @@
 // 自定义校验规则--要求检完时间不能比预计送达时间大
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求检完时间不能为空'))
+    return callback(new Error('要求检完时间必填'))
   }
   if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
     return callback(new Error('要求检完时间应大于预计送达时间'))
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 4e6553f..ebd3996 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -54,7 +54,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(detailForm.value.preEndTime).getTime() <= new Date(detailForm.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c20379d..5de6775 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,7 +5,7 @@
 // import { Row } from 'element-plus/es/components/table-v2/src/components'
 // import VuePdfEmbed from 'vue-pdf-embed'
 // import * as pdfjsLib from 'pdfjs-dist'
-import print from 'vue3-print-nb'
+// import print from 'vue3-print-nb'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -244,7 +244,6 @@
   var ordonnance = document.getElementById(val)!.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
-
     ordonnance.print()
   }, 100)
 }
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 923aac4..bf473cf 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -65,7 +65,7 @@
 // 自定义校验规则--要求检完时间不能比预计送达时间大
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求检完时间不能为空'))
+    return callback(new Error('要求检完时间必填'))
   }
   if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
     return callback(new Error('要求检完时间应大于预计送达时间'))
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 4e6553f..ebd3996 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -54,7 +54,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(detailForm.value.preEndTime).getTime() <= new Date(detailForm.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4e8d460..7ba9ede 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -31,7 +31,7 @@
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '管理状态', value: 'managerStateName', align: 'center' },
@@ -57,11 +57,17 @@
     loadingTable.value = false
   })
 }
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
-  fetchData()
+  clearList()
   if (!newValue) {
-    table.value.clearMulti() // 清除多选选中
+    table.value.clearMulti() // 清除选中
   }
 })
 // 关闭对话框
@@ -73,12 +79,7 @@
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
-// 重置
-const clearList = () => {
-  listQuery.value.equipmentName = ''
-  listQuery.value.equipmentNo = ''
-  fetchData()
-}
+
 // 搜索
 const searchList = () => {
   fetchData()

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 2479614..f342066 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,18 +148,14 @@
 }
 // 单选选中
 const radioChange = () => {
-  console.log('---------')
-
-  console.log(singleChecked.value)
-  console.log(props.data)
-
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
-// 清除多选选中
+// 清除选中
 const clearMulti = () => {
   console.log('清理选中')
-  table.value!.clearSelection()
+  singleChecked.value = '' // 清除单选选中
+  table.value!.clearSelection() // 清除多选选中
 }
 defineExpose({
   clearMulti, initColumnsState,
diff --git a/src/views/business/fieldTest/approve/approve-interface.ts b/src/views/business/fieldTest/approve/approve-interface.ts
index d7ec099..b32bdee 100644
--- a/src/views/business/fieldTest/approve/approve-interface.ts
+++ b/src/views/business/fieldTest/approve/approve-interface.ts
@@ -23,6 +23,7 @@
   approvalStatusName: string // 审批状态
   processId: string // 流程实例id
   taskId: string // 任务id-审批时使用
+  decisionItem: number | string // 同意、驳回、拒绝按钮权限
 }
 
 // 字典
diff --git a/src/views/business/fieldTest/approve/edit.vue b/src/views/business/fieldTest/approve/edit.vue
index 4fff614..3f2062b 100644
--- a/src/views/business/fieldTest/approve/edit.vue
+++ b/src/views/business/fieldTest/approve/edit.vue
@@ -6,7 +6,8 @@
 import dayjs from 'dayjs'
 import selectStaffList from '../components/selectStaffList.vue'
 import type { IForm, dictType } from './approve-interface'
-import { fetchApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -15,7 +16,9 @@
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printPdf } from '@/utils/printUtils'
 import type { userType } from '@/views/system/user/user-interface'
+import { getPhotoUrl } from '@/api/system/tool'
 import SelectDeviceDialog from '@/views/device/receive/selectDeviceDialog.vue'
 import { addFieldTestApproveList, failUpdateFieldTestApprove, getDetail, submit, updateFieldTestApprove } from '@/api/business/fieldTest/apply'
 const user = useUserStore() // 用户信息
@@ -35,6 +38,9 @@
 const submitId = ref('') // 新建提交时所用的id
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref<FormInstance>() // 表单ref
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
+const approvalDialog = ref() // 审批对话ref
 const form = ref<IForm>({
   siteExecutiveNo: '', // 现场检测编号
   siteExecutiveName: '', // 现场检测名字
@@ -70,7 +76,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(form.value.preEndTime).getTime() <= new Date(form.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
@@ -81,7 +87,8 @@
 const formRules = ref<FormRules>({
   directorId: [{ required: true, message: '要求负责人不能为空', trigger: ['blur', 'change'] }],
   taskSource: [{ required: true, message: '要求任务来源不能为空', trigger: ['blur', 'change'] }],
-  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] }],
+  preCost: [{ required: true, message: '要求预计计量费用不能为空', trigger: ['blur', 'change'] },
+    { pattern: /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/, message: '要求大于0，且最多保留两位小数', trigger: ['blur', 'change'] }],
   preStartTime: [{ required: true, message: '要求预计开始时间不能为空', trigger: ['blur', 'change'] }],
   preEndTime: [{ required: true, type: 'date', validator: requireOverTimeValid, trigger: 'change' }],
   // preEndTime: [{ required: true, message: '要求预计结束时间不能为空', trigger: ['blur', 'change'] }],
@@ -445,8 +452,53 @@
   }
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
+  }
+}
+
 // 获取详细信息
 const getInfo = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   getDetail({ id: infoId.value }).then((res) => {
     form.value = res.data
     form.value.meterStaffList = res.data.meterStaffList.map((item: any) => {
@@ -465,6 +517,14 @@
     form.value.applyPerson = user.id// 申请人
     form.value.applyPersonName = user.name // 申请人名字
   })
+  loading.close()
+}
+// 打印
+const print = () => {
+  // getPhotoUrl(printFileName as string).then((res) => {
+  //   const url = res.data
+  //   printPdf(res.data)
+  // })
 }
 
 onMounted(async () => {
@@ -472,6 +532,8 @@
   await getDict()// 字典
   form.value.processId = $route.query.processId as string // 任务id
   approvalStatusName.value = $route.query.approvalStatusName as string // 审批类型名称
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (pageType.value !== 'add') {
     getInfo() // 获取详情
     if (approvalStatusName.value !== '草稿箱') {
@@ -489,14 +551,27 @@
   <app-container>
     <detail-page :title="`现场检测审批-${textMap[pageType]}`">
       <template #btns>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
           提交
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
           保存
         </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+        <!-- <el-button v-if="pageType === 'detail' && approvalStatusName === '已通过' " type="primary" @click="print">
           打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -772,6 +847,7 @@
           :prop="item.value"
           :label="item.text"
           :width="item.width"
+          show-overflow-tooltip
           align="center"
         >
           <template v-if="item.text === '姓名' && pageType !== 'detail'" #default="scope">
@@ -849,5 +925,7 @@
       @close-dialog="closeDialog"
       @update-device-confirm="confirmSelectEquipment"
     />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/approve/list.vue b/src/views/business/fieldTest/approve/list.vue
index e24ed44..85889ed 100644
--- a/src/views/business/fieldTest/approve/list.vue
+++ b/src/views/business/fieldTest/approve/list.vue
@@ -42,7 +42,7 @@
   { text: '现场测试、校准或检定项目', value: 'executiveItem', align: 'center' },
   { text: '负责人', value: 'directorName', align: 'center' },
   { text: '申请时间', value: 'applyTime', align: 'center', width: '180px' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 const list = ref<IList[]>([]) // 列表
 const total = ref(0) // 数据总条数
@@ -206,6 +206,8 @@
       query: {
         approvalStatusName: row.approvalStatusName, // 审批状态名称
         processId: row.processId, // 流程实例
+        decisionItem: row.decisionItem, // 控制同意、驳回、拒绝按钮
+        taskId: row.taskId, // 任务id，用于同意、驳回、拒绝审批
       },
     })
   }
@@ -286,7 +288,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+              :width="(active === '0') ? 200 : (active === '1' || active === '6') ? 150 : (active === '4' || active === '5' || active === '3') ? 100 : 150"
             >
               <template #default="{ row }">
                 <el-button
diff --git a/src/views/business/fieldTest/record/edit.vue b/src/views/business/fieldTest/record/edit.vue
index 6fb186f..12e04e7 100644
--- a/src/views/business/fieldTest/record/edit.vue
+++ b/src/views/business/fieldTest/record/edit.vue
@@ -9,6 +9,8 @@
 import useUserStore from '@/store/modules/user'
 import { getDetail } from '@/api/business/fieldTest/apply'
 import { getUsersDept } from '@/api/device/standard'
+import { getPhotoUrl } from '@/api/system/tool'
+import { printPdf } from '@/utils/printUtils'
 import type { IOptions } from '@/views/device/standardEquipment/standard_interface'
 import { addFieldTestRecordList, getRecordDetail, updateFieldTestRecord } from '@/api/business/fieldTest/record'
 const user = useUserStore() // 用户信息
@@ -47,20 +49,21 @@
   humidity: '', // 湿度
   remark: '', // 备注
   siteExecutiveEquipmentRelationList: [] as any,
+  printFileName: '', // 打印文件名
 })
 const list = ref([]) // 记录结果表
 // 校验规则
 const formRules = ref({
-  laboratoryId: [{ required: true, message: '要求实验室不能为空', trigger: ['blur', 'change'] }],
-  siteExecutiveNo: [{ required: true, message: '要求现场检测编号不能为空', trigger: ['blur', 'change'] }],
-  executiveAddress: [{ required: true, message: '要求现场工作地点不能为空', trigger: ['blur', 'change'] }],
-  outputVoltage: [{ required: true, message: '要求供电电压不能为空', trigger: ['blur', 'change'] },
+  laboratoryId: [{ required: true, message: '实验室必填', trigger: ['blur', 'change'] }],
+  siteExecutiveNo: [{ required: true, message: '现场检测编号必填', trigger: ['blur', 'change'] }],
+  executiveAddress: [{ required: true, message: '现场工作地点必填', trigger: ['blur', 'change'] }],
+  outputVoltage: [{ required: true, message: '供电电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '供电电压只能为数字', trigger: ['blur', 'change'] }],
-  zeroGroundVoltage: [{ required: true, message: '要求零地电压不能为空', trigger: ['blur', 'change'] },
+  zeroGroundVoltage: [{ required: true, message: '零地电压必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '零地电压只能为数字', trigger: ['blur', 'change'] }],
-  temperature: [{ required: true, message: '要求温度不能为空', trigger: ['blur', 'change'] },
+  temperature: [{ required: true, message: '温度必填', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] }],
-  humidity: [{ 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'] }],
 })
 // ----------------------------------路由参数--------------------------------------------
@@ -222,7 +225,12 @@
     }
   })
 }
-
+// 打印
+const print = () => {
+  getPhotoUrl(form.value.printFileName as string).then((res) => {
+    printPdf(res.data)
+  })
+}
 onMounted(async () => {
   await fetchUsersDept()
   await fetchStaffList()
diff --git a/src/views/business/fieldTest/record/record-interface.ts b/src/views/business/fieldTest/record/record-interface.ts
index c629f47..95b67fe 100644
--- a/src/views/business/fieldTest/record/record-interface.ts
+++ b/src/views/business/fieldTest/record/record-interface.ts
@@ -43,5 +43,6 @@
   humidity: string // 湿度
   remark: string // 备注
   siteExecutiveEquipmentRelationList: any
+  printFileName: string // 打印文件名
 }
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c20379d..5de6775 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,7 +5,7 @@
 // import { Row } from 'element-plus/es/components/table-v2/src/components'
 // import VuePdfEmbed from 'vue-pdf-embed'
 // import * as pdfjsLib from 'pdfjs-dist'
-import print from 'vue3-print-nb'
+// import print from 'vue3-print-nb'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -244,7 +244,6 @@
   var ordonnance = document.getElementById(val)!.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
-
     ordonnance.print()
   }, 100)
 }
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 923aac4..bf473cf 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -65,7 +65,7 @@
 // 自定义校验规则--要求检完时间不能比预计送达时间大
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求检完时间不能为空'))
+    return callback(new Error('要求检完时间必填'))
   }
   if (new Date(dataForm.value.planDeliverTime).getTime() >= new Date(dataForm.value.requireOverTime).getTime()) {
     return callback(new Error('要求检完时间应大于预计送达时间'))
diff --git a/src/views/business/subpackage/apply/edit.vue b/src/views/business/subpackage/apply/edit.vue
index 4e6553f..ebd3996 100644
--- a/src/views/business/subpackage/apply/edit.vue
+++ b/src/views/business/subpackage/apply/edit.vue
@@ -54,7 +54,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   if (!value) {
-    return callback(new Error('要求预计结束时间不能为空'))
+    return callback(new Error('预计结束时间必填'))
   }
   if (new Date(detailForm.value.preEndTime).getTime() <= new Date(detailForm.value.preStartTime).getTime()) {
     return callback(new Error('不能小于预计开始时间'))
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4e8d460..7ba9ede 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -31,7 +31,7 @@
 const list = ref([])// 表格数据
 const columns = ref<TableColumn[]>([
   { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
-  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true, width: '160' },
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '管理状态', value: 'managerStateName', align: 'center' },
@@ -57,11 +57,17 @@
     loadingTable.value = false
   })
 }
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
 watch(() => props.dialogSelectDiviceVisible, (newValue) => {
   dialogTableVisible.value = newValue
-  fetchData()
+  clearList()
   if (!newValue) {
-    table.value.clearMulti() // 清除多选选中
+    table.value.clearMulti() // 清除选中
   }
 })
 // 关闭对话框
@@ -73,12 +79,7 @@
   emits('updateDeviceConfirm', checkoutList.value)
   close()
 }
-// 重置
-const clearList = () => {
-  listQuery.value.equipmentName = ''
-  listQuery.value.equipmentNo = ''
-  fetchData()
-}
+
 // 搜索
 const searchList = () => {
   fetchData()
diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue
index 21e36fc..f2772ab 100644
--- a/src/views/finance/contract/edit.vue
+++ b/src/views/finance/contract/edit.vue
@@ -98,7 +98,7 @@
 // 自定义校验规则--要求预计结束时间大于预计开始时间
 const requireOverTimeValid = (rule: any, value: any, callback: any) => {
   // if (!value) {
-  //   return callback(new Error('合同结束日期不能为空'))
+  //   return callback(new Error('合同结束日期必填'))
   // }
   if (form.value.agreementEndDate && form.value.agreementStartDate) {
     if (new Date(form.value.agreementEndDate).getTime() <= new Date(form.value.agreementStartDate).getTime()) {
@@ -338,7 +338,7 @@
 const approvalSuccess = () => {
   close() // 返回上一页
 }
-// 操作
+// 审批
 const handleApprove = (val: string, title = '') => {
   if (val === '取消') {
     const params = {
@@ -528,10 +528,10 @@
         <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
           驳回
         </el-button>
-        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="primary" @click="handleApprove('拒绝')">
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
           拒绝
         </el-button>
-        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="primary" @click="handleApprove('取消')">
+        <el-button v-if="pageType === 'detail' && approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
           取消
         </el-button>
         <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">